[xen stable-4.18] automation: fix race condition in adl-suspend test

[patchbot@xxxxxxx]

commit 2926952b35d648eb1bca921662f0e64ab3fed29f
Author:     Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Tue Oct 31 03:16:53 2023 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Oct 31 11:06:16 2023 +0000

    automation: fix race condition in adl-suspend test
    
    If system suspends too quickly, the message for the test controller to
    wake up the system may be not sent to the console before suspending.
    This will cause the test to timeout.
    
    Fix this by calling sync on the console and waiting a bit after printing
    the message. The test controller then resumes the system 30s after the
    message, so as long as the delay + suspending takes less time it is
    okay.
    
    Signed-off-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
    Release-acked-by: Henry Wang <Henry.Wang@xxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    (cherry picked from commit df43b54590e10b6199e44741b453fcbae2b06d25)
---
 automation/scripts/qubes-x86-64.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/automation/scripts/qubes-x86-64.sh 
b/automation/scripts/qubes-x86-64.sh
index f5dae82358..51323b1ae0 100755
--- a/automation/scripts/qubes-x86-64.sh
+++ b/automation/scripts/qubes-x86-64.sh
@@ -54,11 +54,12 @@ until grep 'domU started' 
/var/log/xen/console/guest-domU.log; do
     sleep 1
 done
 echo \"${wait_and_wakeup}\"
+# let the above message flow to console, then suspend
+sync /dev/stdout
+sleep 5
 set -x
 echo deep > /sys/power/mem_sleep
 echo mem > /sys/power/state
-# now wait for resume
-sleep 5
 xl list
 xl dmesg | grep 'Finishing wakeup from ACPI S3 state' || exit 1
 # check if domU is still alive
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.18