Merge branch 'release-4.16.1'

[i3/i3] / testcases / t / 205-ipc-windows.t

diff --git a/testcases/t/205-ipc-windows.t b/testcases/t/205-ipc-windows.t
index ca7db1533493416550d1f984f626f8cc796fc406..bafd155f6afeecf055bd0efc5579ad667c8ee174 100644 (file)
--- a/testcases/t/205-ipc-windows.t
+++ b/testcases/t/205-ipc-windows.t
@@ -16,46 +16,15 @@
 
 use i3test;
 
-SKIP: {
-
-    skip "AnyEvent::I3 too old (need >= 0.15)", 1 if $AnyEvent::I3::VERSION < 0.15;
-
-my $i3 = i3(get_socket_path());
-$i3->connect()->recv;
-
-################################
-# Window event
-################################
-
-# Events
-
 my $new = AnyEvent->condvar;
 my $focus = AnyEvent->condvar;
-$i3->subscribe({
-    window => sub {
-        my ($event) = @_;
-        if ($event->{change} eq 'new') {
-            $new->send($event);
-        } elsif ($event->{change} eq 'focus') {
-            $focus->send($event);
-        }
-    }
-})->recv;
-
-open_window;
-
-my $t;
-$t = AnyEvent->timer(
-    after => 0.5,
-    cb => sub {
-        $new->send(0);
-        $focus->send(0);
-    }
-);
 
-is($new->recv->{container}->{focused}, 0, 'Window "new" event received');
-is($focus->recv->{container}->{focused}, 1, 'Window "focus" event received');
+my @events = events_for(
+    sub { open_window },
+    'window');
 
-}
+is(scalar @events, 2, 'Received 2 events');
+is($events[0]->{container}->{focused}, 0, 'Window "new" event received');
+is($events[1]->{container}->{focused}, 1, 'Window "focus" event received');
 
 done_testing;