From d830d985c19de9dfd970c010b0c1594f125791ac Mon Sep 17 00:00:00 2001 From: Sebastian Keller Date: Fri, 26 Jun 2020 21:31:10 +0200 Subject: [PATCH] tests/stacking: Don't test for time-dependent intermediate focus state While c3d13203 ensured that the test-client has actually closed the window before testing for the focus change, it also made another timing related issue with the tests more likely to happen. Serveral tests assert that the focus is set to 'none' after the focussed window has been closed when the window below does not accept focus. This however can never be reliably tested, because closing the window triggers timeout based iteration of a queue of default focus candidate windows. This starts after the window has been closed and might finish before the clients have finished synchronizing. This issue is more likely to trigger the shorter the queue is and the more test clients there are that could delay the synchronization. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1329 --- ...ient-no-input-parent-delayed-focus-default-cancelled.metatest | 1 - src/tests/stacking/closed-transient-no-input-parent.metatest | 1 - ...ient-no-input-parents-queued-default-focus-destroyed.metatest | 1 - src/tests/stacking/closed-transient-no-input-parents.metatest | 1 - 4 files changed, 4 deletions(-) diff --git a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest index 75a17e4e5..90a65e659 100644 --- a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest +++ b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest @@ -22,7 +22,6 @@ assert_stacking 2/1 1/1 1/2 1/3 destroy 1/3 wait -assert_focused none assert_stacking 2/1 1/1 1/2 activate 2/1 diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest index 1fe00d7bf..5c2be11fb 100644 --- a/src/tests/stacking/closed-transient-no-input-parent.metatest +++ b/src/tests/stacking/closed-transient-no-input-parent.metatest @@ -22,7 +22,6 @@ assert_stacking 2/1 1/1 1/2 1/3 destroy 1/3 wait -assert_focused none assert_stacking 2/1 1/1 1/2 sleep 150 diff --git a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest index 213177133..e361fbdf6 100644 --- a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest +++ b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest @@ -32,7 +32,6 @@ assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 destroy 1/5 wait -assert_focused none assert_stacking 0/1 1/1 1/2 1/3 1/4 destroy 1/2 diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest index dcba70eba..365f6f444 100644 --- a/src/tests/stacking/closed-transient-no-input-parents.metatest +++ b/src/tests/stacking/closed-transient-no-input-parents.metatest @@ -32,7 +32,6 @@ assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 destroy 1/5 wait -assert_focused none assert_stacking 0/1 1/1 1/2 1/3 1/4 sleep 600