Merge branch 'master' into next

[i3/i3] / testcases / t / 140-focus-lost.t

diff --git a/testcases/t/140-focus-lost.t b/testcases/t/140-focus-lost.t
index fb77f01e83b75ebefb943da352e4cfde2af09162..3d78b1bd566a9ee022977e80bee5890cb67dfd00 100644 (file)
--- a/testcases/t/140-focus-lost.t
+++ b/testcases/t/140-focus-lost.t
@@ -3,14 +3,8 @@
 # Regression: Check if the focus stays the same when switching the layout
 # bug introduced by 77d0d42ed2d7ac8cafe267c92b35a81c1b9491eb
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
-my $x = X11::XCB::Connection->new;
 
 sub check_order {
     my ($msg) = @_;
@@ -19,16 +13,14 @@ sub check_order {
     my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
     my @sorted = sort @nums;
 
-    cmp_deeply(\@nums, \@sorted, $msg);
+    is_deeply(\@nums, \@sorted, $msg);
 }
 
 my $tmp = fresh_workspace;
 
-my $left = open_window($x);
-my $mid = open_window($x);
-my $right = open_window($x);
-
-sync_with_i3($x);
+my $left = open_window;
+my $mid = open_window;
+my $right = open_window;
 
 diag("left = " . $left->id . ", mid = " . $mid->id . ", right = " . $right->id);