Commit 68c2b33e authored by K900's avatar K900
Browse files

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...)
parent aa0f1764

nixos/tests/lxqt.nix

+1 −1
Original line number Diff line number Diff line
@@ -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_*'")

nixos/tests/maestral.nix

+1 −1
Original line number Diff line number Diff line
@@ -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}")

nixos/tests/plasma6.nix

+1 −1
Original line number Diff line number Diff line
@@ -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_*'")

nixos/tests/retroarch.nix

+1 −1
Original line number Diff line number Diff line
@@ -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"):

nixos/tests/sddm.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ")

      '';