tests: use i3_config arg instead of precisely one launch_with_config

This way, tests are shorter, and i3test’s invocation of launch_with_config
parallelizes work better, using dont_block => 1.
This commit is contained in:
Michael Stapelberg
2017-09-14 12:30:42 +02:00
parent 28bfeadbb0
commit e5ee11d896
61 changed files with 187 additions and 538 deletions

View File

@ -19,7 +19,14 @@
# Ticket: #2062
# Bug still in: 4.11-103-gc8d51b4
# Bug introduced with commit 0e5180cae9e9295678e3f053042b559e82cb8c98
use i3test i3_autostart => 0;
use i3test
i3_config => <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Print nop Print
bindsym Mod4+Return nop Mod4+Return
EOT
use i3test::XTEST;
use ExtUtils::PkgConfig;
@ -29,16 +36,6 @@ SKIP: {
skip "setxkbmap not found", 1 if
system(q|setxkbmap -print >/dev/null|) != 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
bindsym Print nop Print
bindsym Mod4+Return nop Mod4+Return
EOT
my $pid = launch_with_config($config);
start_binding_capture;
system(q|setxkbmap us,ru -option grp:alt_shift_toggle|);
@ -92,8 +89,6 @@ is(scalar @i3test::XTEST::binding_events, 4, 'Received exactly 4 binding events'
# Disable the grp:alt_shift_toggle option, as we use Alt+Shift in other testcases.
system(q|setxkbmap us -option|);
exit_gracefully($pid);
}
done_testing;