Merge branch 'release-4.16.1'

[i3/i3] / testcases / t / 263-config-reload-reverts-bind-mode.t

diff --git a/testcases/t/263-config-reload-reverts-bind-mode.t b/testcases/t/263-config-reload-reverts-bind-mode.t
index d72d3d94d5732f260be076c51c781d3efae8f92d..1416b6b9e19bedf3d0e0b46feefa6c837d92413b 100644 (file)
--- a/testcases/t/263-config-reload-reverts-bind-mode.t
+++ b/testcases/t/263-config-reload-reverts-bind-mode.t
@@ -2,13 +2,13 @@
 # vim:ts=4:sw=4:expandtab
 #
 # Please read the following documents before working on tests:
-# • http://build.i3wm.org/docs/testsuite.html
+# • https://build.i3wm.org/docs/testsuite.html
 #   (or docs/testsuite)
 #
-# • http://build.i3wm.org/docs/lib-i3test.html
+# • https://build.i3wm.org/docs/lib-i3test.html
 #   (alternatively: perldoc ./testcases/lib/i3test.pm)
 #
-# • http://build.i3wm.org/docs/ipc.html
+# • https://build.i3wm.org/docs/ipc.html
 #   (or docs/ipc)
 #
 # • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
@@ -18,9 +18,7 @@
 # binding mode.
 # Ticket: #2228
 # Bug still in: 4.11-262-geb631ce
-use i3test i3_autostart => 0;
-
-my $config = <<EOT;
+use i3test i3_config => <<EOT;
 # i3 config file (v4)
 font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
 
@@ -28,29 +26,13 @@ mode "othermode" {
 }
 EOT
 
-my $pid = launch_with_config($config);
-
 cmd 'mode othermode';
 
-my $i3 = i3(get_socket_path(0));
-$i3->connect->recv;
-
-my $cv = AnyEvent->condvar;
-$i3->subscribe({
-    mode => sub {
-        my ($event) = @_;
-        $cv->send($event->{change} eq 'default');
-    }
-})->recv;
-
-cmd 'reload';
-
-# Timeout after 0.5s
-my $t;
-$t = AnyEvent->timer(after => 0.5, cb => sub { $cv->send(0); });
-
-ok($cv->recv, 'Mode event received');
+my @events = events_for(
+    sub { cmd 'reload' },
+    'mode');
 
-exit_gracefully($pid);
+is(scalar @events, 1, 'Received 1 event');
+is($events[0]->{change}, 'default', 'change is "default"');
 
 done_testing;