diff --git a/src/tests/stacking/click-to-focus-and-raise.metatest b/src/tests/stacking/click-to-focus-and-raise.metatest index a1f4e502e..dc18e7b44 100644 --- a/src/tests/stacking/click-to-focus-and-raise.metatest +++ b/src/tests/stacking/click-to-focus-and-raise.metatest @@ -16,8 +16,8 @@ wait_reconfigure w/1 w/2 move w/1 0 0 move w/2 100 0 - -wait_reconfigure w/1 w/2 +assert_position w/1 0 0 +assert_position w/2 100 0 assert_stacking w/1 w/2 assert_focused w/2 diff --git a/src/tests/stacking/sloppy-focus-auto-raise.metatest b/src/tests/stacking/sloppy-focus-auto-raise.metatest index b3901afde..74ed6e3dc 100644 --- a/src/tests/stacking/sloppy-focus-auto-raise.metatest +++ b/src/tests/stacking/sloppy-focus-auto-raise.metatest @@ -21,8 +21,8 @@ wait_reconfigure w/0 w/1 move w/0 0 0 move w/1 100 0 - -wait +assert_position w/0 0 0 +assert_position w/1 100 0 assert_stacking w/0 w/1 assert_focused w/1 @@ -32,6 +32,8 @@ assert_size w/0 100 100 assert_position w/1 100 0 assert_size w/1 100 100 +wait + move_cursor_to 150 50 assert_stacking w/0 w/1 diff --git a/src/tests/stacking/sloppy-focus-pointer-rest.metatest b/src/tests/stacking/sloppy-focus-pointer-rest.metatest index 5a718295a..87e11f6fd 100644 --- a/src/tests/stacking/sloppy-focus-pointer-rest.metatest +++ b/src/tests/stacking/sloppy-focus-pointer-rest.metatest @@ -24,8 +24,9 @@ wait_reconfigure w/0 w/1 w/2 move w/0 0 0 move w/1 100 0 move w/2 200 0 - -wait +assert_position w/0 0 0 +assert_position w/1 100 0 +assert_position w/2 200 0 assert_stacking w/0 w/1 w/2 assert_focused w/2 @@ -37,6 +38,8 @@ assert_size w/1 100 100 assert_position w/2 200 0 assert_size w/2 100 100 +wait + move_cursor_to 50 50 sleep 50 diff --git a/src/tests/stacking/sloppy-focus.metatest b/src/tests/stacking/sloppy-focus.metatest index 2ef4b1558..f6e097690 100644 --- a/src/tests/stacking/sloppy-focus.metatest +++ b/src/tests/stacking/sloppy-focus.metatest @@ -19,8 +19,8 @@ wait_reconfigure w/0 w/1 move w/0 0 0 move w/1 100 0 - -wait +assert_position w/0 0 0 +assert_position w/1 100 0 assert_stacking w/0 w/1 assert_focused w/1 @@ -30,6 +30,8 @@ assert_size w/0 100 100 assert_position w/1 100 0 assert_size w/1 100 100 +wait + move_cursor_to 50 50 assert_stacking w/0 w/1 diff --git a/src/tests/stacking/strut-changes.metatest b/src/tests/stacking/strut-changes.metatest index b714c641b..7ae2232fe 100644 --- a/src/tests/stacking/strut-changes.metatest +++ b/src/tests/stacking/strut-changes.metatest @@ -101,7 +101,6 @@ assert_position w/1 MONITOR_WIDTH/4 MONITOR_HEIGHT/4 assert_size w/1 MONITOR_WIDTH/2 MONITOR_HEIGHT/2 move w/1 0 0 -wait_reconfigure w/1 assert_position w/1 MONITOR_WIDTH/4 MONITOR_HEIGHT/4 assert_size w/1 MONITOR_WIDTH/2 MONITOR_HEIGHT/2 diff --git a/src/tests/stacking/workspace-only-on-primary-focus.metatest b/src/tests/stacking/workspace-only-on-primary-focus.metatest index c6c5d4a73..d4aeaa768 100644 --- a/src/tests/stacking/workspace-only-on-primary-focus.metatest +++ b/src/tests/stacking/workspace-only-on-primary-focus.metatest @@ -22,8 +22,8 @@ wait_reconfigure w/1 w/2 # make sure the windows are on the secondary monitor move w/1 800 0 move w/2 900 0 - -wait_reconfigure w/1 w/2 +assert_position w/1 800 0 +assert_position w/2 900 0 assert_stacking w/1 w/2 assert_focused w/2