Merge branch 'master' into next

[i3/i3] / testcases / t / 503-workspace.t

diff --git a/testcases/t/503-workspace.t b/testcases/t/503-workspace.t
index 7122cb34f503761e34af70d94e760e14b2be6533..94ba34349295d1a4e62b58c65250bf70ce8e4593 100644 (file)
--- a/testcases/t/503-workspace.t
+++ b/testcases/t/503-workspace.t
@@ -4,12 +4,23 @@
 # Tests whether 'workspace next_on_output' and the like work correctly.
 #
 use List::Util qw(first);
-use i3test;
+use i3test i3_autostart => 0;
+
+my $config = <<EOT;
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+
+fake-outputs 1024x768+0+0,1024x768+1024+0
+EOT
+my $pid = launch_with_config($config);
 
 ################################################################################
 # Setup workspaces so that they stay open (with an empty container).
 ################################################################################
 
+$x->root->warp_pointer(0, 0);
+sync_with_i3;
+
 is(focused_ws, '1', 'starting on workspace 1');
 # ensure workspace 1 stays open
 open_window;
@@ -58,7 +69,15 @@ is(focused_ws, '1', 'workspace 1 focused');
 
 cmd 'workspace 2';
 
+# XXX: This is to avoid EnterNotifies changing the focus. Not sure why they
+# appear sometimes in the first place. Only happens when running the full
+# testsuite.
+$x->root->warp_pointer(1025, 0);
+sync_with_i3;
+
 cmd 'workspace prev_on_output';
 is(focused_ws, '2', 'workspace 2 focused');
 
+exit_gracefully($pid);
+
 done_testing;