Merge branch 'master' into next

[i3/i3] / testcases / t / 170-force_focus_wrapping.t

diff --git a/testcases/t/170-force_focus_wrapping.t b/testcases/t/170-force_focus_wrapping.t
index 8a990f23e96dc649880f306de312a2438aaf1f80..30458b00a2920503dfe3b1c70882f331a3d7a602 100644 (file)
--- a/testcases/t/170-force_focus_wrapping.t
+++ b/testcases/t/170-force_focus_wrapping.t
@@ -5,10 +5,6 @@
 # Tests if the 'force_focus_wrapping' config directive works correctly.
 #
 use i3test;
-use X11::XCB qw(:all);
-use X11::XCB::Connection;
-
-my $x = X11::XCB::Connection->new;
 
 #####################################################################
 # 1: test the wrapping behaviour without force_focus_wrapping
@@ -25,13 +21,13 @@ my $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-my $first = open_window($x);
-my $second = open_window($x);
+my $first = open_window;
+my $second = open_window;
 
 cmd 'layout tabbed';
 cmd 'focus parent';
 
-my $third = open_window($x);
+my $third = open_window;
 is($x->input_focus, $third->id, 'third window focused');
 
 cmd 'focus left';
@@ -66,15 +62,13 @@ $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-$first = open_window($x);
-$second = open_window($x);
+$first = open_window;
+$second = open_window;
 
 cmd 'layout tabbed';
 cmd 'focus parent';
 
-$third = open_window($x);
-
-sync_with_i3($x);
+$third = open_window;
 
 is($x->input_focus, $third->id, 'third window focused');