nixos/tests: better handling of SDDM xauth files

Clearly, the sleep is not sleeping enough, so actually wait
for the cookie to be written (and hope that it doesn't get
split into multiple writes...)
This commit is contained in:
K900
2025-08-25 15:31:01 +03:00
parent aa0f1764fe
commit 68c2b33ead
5 changed files with 6 additions and 6 deletions

View File

@@ -37,7 +37,7 @@
with subtest("Wait for login"):
machine.wait_for_x()
machine.wait_for_file("/tmp/xauth_*")
machine.sleep(1)
machine.wait_until_succeeds("test -s /tmp/xauth_*")
machine.succeed("xauth merge /tmp/xauth_*")
machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")

View File

@@ -71,7 +71,7 @@
with subtest("GUI"):
gui.wait_for_x()
gui.wait_for_file("/run/user/1000/xauth_*")
gui.sleep(1)
gui.wait_until_succeeds("test -s /run/user/1000/xauth_*")
gui.succeed("xauth merge /run/user/1000/xauth_*")
gui.wait_for_window("^Desktop ")
gui.wait_for_unit("maestral.service", "${user.name}")

View File

@@ -33,7 +33,7 @@
with subtest("Wait for login"):
start_all()
machine.wait_for_file("/run/user/1000/xauth_*")
machine.sleep(1)
machine.wait_until_succeeds("test -s /run/user/1000/xauth_*")
machine.succeed("xauth merge /run/user/1000/xauth_*")
machine.succeed("su - ${user.name} -c 'xauth merge /run/user/1000/xauth_*'")

View File

@@ -36,7 +36,7 @@
with subtest("Wait for login"):
start_all()
machine.wait_for_file("/run/sddm/xauth_*")
machine.sleep(1)
machine.wait_until_succeeds("test -s /run/sddm/xauth_*")
machine.succeed("xauth merge /run/sddm/xauth_*")
with subtest("Check RetroArch started"):

View File

@@ -24,7 +24,7 @@
machine.screenshot("sddm")
machine.send_chars("${user.password}\n")
machine.wait_for_file("/tmp/xauth_*")
machine.sleep(1)
machine.wait_until_succeeds("test -s /tmp/xauth_*")
machine.succeed("xauth merge /tmp/xauth_*")
machine.wait_for_window("^IceWM ")
'';
@@ -55,7 +55,7 @@
testScript = ''
start_all()
machine.wait_for_file("/tmp/xauth_*")
machine.sleep(1)
machine.wait_until_succeeds("test -s /tmp/xauth_*")
machine.succeed("xauth merge /tmp/xauth_*")
machine.wait_for_window("^IceWM ")
'';