From 50e667b29b43ea770ddca97ecd36333f1137531c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 22 Aug 2024 15:08:13 +0200 Subject: [PATCH] tests/stacking: Replace a couple of sleep;assert_focused with wait_focused This should hopefully get rid of race conditions in those tests. Part-of: --- ...no-input-parent-delayed-focus-default-cancelled.metatest | 5 +---- ...no-input-parents-queued-default-focus-destroyed.metatest | 6 +----- 2 files changed, 2 insertions(+), 9 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 90a65e659..13ab2f1ad 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 @@ -30,8 +30,5 @@ wait assert_focused 2/1 assert_stacking 1/1 1/2 2/1 -sleep 250 -wait - -assert_focused 2/1 +wait_focused 2/1 assert_stacking 1/1 1/2 2/1 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 e361fbdf6..8e5bb78a7 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 @@ -35,10 +35,6 @@ wait assert_stacking 0/1 1/1 1/2 1/3 1/4 destroy 1/2 -wait -sleep 450 -wait - -assert_focused 1/1 +wait_focused 1/1 assert_stacking 0/1 1/1 1/3 1/4