Merge branch 'master' into next

[i3/i3] / testcases / t / 133-size-hints.t

diff --git a/testcases/t/133-size-hints.t b/testcases/t/133-size-hints.t
index 90ecf62e8623d7a64d3f662a7ca4044f8294dfa8..d3736e3c35fee0d64db0546b4de63adcdd8da24b 100644 (file)
--- a/testcases/t/133-size-hints.t
+++ b/testcases/t/133-size-hints.t
@@ -9,7 +9,7 @@ my $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-my $win = open_window($x, { dont_map => 1 });
+my $win = open_window({ dont_map => 1 });
 # XXX: we should check screen size. in screens with an AR of 2.0,
 # this is not a good idea.
 my $aspect = X11::XCB::Sizehints::Aspect->new;
@@ -19,11 +19,11 @@ $aspect->max_num(600);
 $aspect->max_den(300);
 $win->_create;
 $win->map;
-wait_for_map $x;
+wait_for_map $win;
 $win->hints->aspect($aspect);
 $x->flush;
 
-sync_with_i3($x);
+sync_with_i3;
 
 my $rect = $win->rect;
 my $ar = $rect->width / $rect->height;