tests: sync_with_i3 before warping pointer

To be honest, I’m not entirely sure where the race condition originates
from, but when making sure that there are no pending events
(which is what sync_with_i3 accomplishes) before warping the pointer, we
have less flaky testsuite runs.

closes #1189

diff --git a/testcases/t/132-move-workspace.t b/testcases/t/132-move-workspace.t
index 6367488a3b4b6495fe872c356049e7b10bba31d5..1e0a3478efc98e02dfbc5bddaba03000a7953969 100644 (file)
--- a/testcases/t/132-move-workspace.t
+++ b/testcases/t/132-move-workspace.t
@@ -22,6 +22,7 @@ my $i3 = i3(get_socket_path());
 
 # We move the pointer out of our way to avoid a bug where the focus will
 # be set to the window under the cursor
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 

diff --git a/testcases/t/156-fullscreen-focus.t b/testcases/t/156-fullscreen-focus.t
index 170c641d2e0b918c146738ce4f8965e52903c62d..b337de9a1db1a25db443dbbbdb71177e72d8ced7 100644 (file)
--- a/testcases/t/156-fullscreen-focus.t
+++ b/testcases/t/156-fullscreen-focus.t
@@ -126,6 +126,7 @@ is($nodes->[0]->{focused}, 1, 'fullscreen window focused');
 cmd 'fullscreen';
 
 # Focus screen 1
+sync_with_i3;
 $x->root->warp_pointer(1025, 0);
 sync_with_i3;
 
@@ -134,6 +135,7 @@ cmd "workspace $tmp";
 my $diff_ws = open_window;
 
 # Focus screen 0
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 

diff --git a/testcases/t/502-focus-output.t b/testcases/t/502-focus-output.t
index 8c1c36c5a9f551cb06678b881180ffced0c875d5..cf297f0e2e72ee6ed8df94816deb3664de75156b 100644 (file)
--- a/testcases/t/502-focus-output.t
+++ b/testcases/t/502-focus-output.t
@@ -41,6 +41,7 @@ sub focused_output {
     return $output->{name};
 }
 
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 

diff --git a/testcases/t/503-workspace.t b/testcases/t/503-workspace.t
index c79643e3592705bb98441b7ee5ee10f56691c740..7fe7f15b237953c7c6af3149260973bb3895af1b 100644 (file)
--- a/testcases/t/503-workspace.t
+++ b/testcases/t/503-workspace.t
@@ -31,6 +31,7 @@ my $pid = launch_with_config($config);
 # Setup workspaces so that they stay open (with an empty container).
 ################################################################################
 
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 

diff --git a/testcases/t/505-scratchpad-resolution.t b/testcases/t/505-scratchpad-resolution.t
index de13a544f133dc8622ea05cd6ec9482a83d7ecf4..2235e802fec5354c7e61d335ae8da188190d6c10 100644 (file)
--- a/testcases/t/505-scratchpad-resolution.t
+++ b/testcases/t/505-scratchpad-resolution.t
@@ -29,6 +29,7 @@ my $pid = launch_with_config($config);
 
 my $i3 = i3(get_socket_path());
 
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 
@@ -76,6 +77,7 @@ verify_scratchpad_doesnt_move($second);
 # now on the right output (1024x768)
 ################################################################################
 
+sync_with_i3;
 $x->root->warp_pointer(683 + 10, 0);
 sync_with_i3;
 

diff --git a/testcases/t/506-focus-right.t b/testcases/t/506-focus-right.t
index 3f58b00c2950baf697e6fc9dc737241ebd9330b7..aa0b9c9aee921d982a43458e0d63b7c1a87083dd 100644 (file)
--- a/testcases/t/506-focus-right.t
+++ b/testcases/t/506-focus-right.t
@@ -28,6 +28,7 @@ sub test_focus_left_right {
 
     my $i3 = i3(get_socket_path(0));
 
+    sync_with_i3;
     $x->root->warp_pointer(0, 0);
     sync_with_i3;
 
@@ -140,6 +141,7 @@ my $pid = launch_with_config($config);
 
 my $i3 = i3(get_socket_path(0));
 
+sync_with_i3;
 $x->root->warp_pointer(0, 0);
 sync_with_i3;
 

diff --git a/testcases/t/510-focus-across-outputs.t b/testcases/t/510-focus-across-outputs.t
index 2c6fd396ff5471e0e55c0faee59152978ee81b44..afa0ddef77f3a925eecab1aa70b4816f7288468b 100644 (file)
--- a/testcases/t/510-focus-across-outputs.t
+++ b/testcases/t/510-focus-across-outputs.t
@@ -38,6 +38,7 @@ my $third = open_window;
 cmd 'floating toggle';
 
 # Focus screen 1
+sync_with_i3;
 $x->root->warp_pointer(1025, 0);
 sync_with_i3;
 my $s1_ws = fresh_workspace;
@@ -45,6 +46,7 @@ my $s1_ws = fresh_workspace;
 my $fourth = open_window;
 
 # Focus screen 2
+sync_with_i3;
 $x->root->warp_pointer(0, 769);
 sync_with_i3;
 my $s2_ws = fresh_workspace;
@@ -52,6 +54,7 @@ my $s2_ws = fresh_workspace;
 my $fifth = open_window;
 
 # Focus screen 3
+sync_with_i3;
 $x->root->warp_pointer(1025, 769);
 sync_with_i3;
 my $s3_ws = fresh_workspace;