pyrox.dev / nixpkgs
lol
fork atom

nixos/tests: fix tests that use SDDM (#436705)

authored by K900 and committed by GitHub 756bd89f a615222f

+15 -10
unified split
+1
nixos/tests/lxqt.nix
··· 37 37 with subtest("Wait for login"): 38 38 machine.wait_for_x() 39 39 machine.wait_for_file("/tmp/xauth_*") 40 + machine.sleep(1) 40 41 machine.succeed("xauth merge /tmp/xauth_*") 41 42 machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") 42 43
+3 -2
nixos/tests/maestral.nix
··· 70 70 71 71 with subtest("GUI"): 72 72 gui.wait_for_x() 73 - gui.wait_for_file("/tmp/xauth_*") 74 - gui.succeed("xauth merge /tmp/xauth_*") 73 + gui.wait_for_file("/run/user/1000/xauth_*") 74 + gui.sleep(1) 75 + gui.succeed("xauth merge /run/user/1000/xauth_*") 75 76 gui.wait_for_window("^Desktop ") 76 77 gui.wait_for_unit("maestral.service", "${user.name}") 77 78 '';
+4 -4
nixos/tests/plasma6.nix
··· 32 32 '' 33 33 with subtest("Wait for login"): 34 34 start_all() 35 - machine.wait_for_file("/tmp/xauth_*") 36 - machine.succeed("xauth merge /tmp/xauth_*") 35 + machine.wait_for_file("/run/user/1000/xauth_*") 36 + machine.sleep(1) 37 + machine.succeed("xauth merge /run/user/1000/xauth_*") 38 + machine.succeed("su - ${user.name} -c 'xauth merge /run/user/1000/xauth_*'") 37 39 38 40 with subtest("Check plasmashell started"): 39 41 machine.wait_until_succeeds("pgrep plasmashell") ··· 44 46 45 47 with subtest("Ensure Elisa is not installed"): 46 48 machine.fail("which elisa") 47 - 48 - machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") 49 49 50 50 with subtest("Run Dolphin"): 51 51 machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
+5 -4
nixos/tests/retroarch.nix
··· 16 16 enable = true; 17 17 package = pkgs.retroarch-bare; 18 18 }; 19 - services.xserver.displayManager = { 19 + services.displayManager = { 20 20 sddm.enable = true; 21 21 defaultSession = "RetroArch"; 22 22 autoLogin = { ··· 29 29 testScript = 30 30 { nodes, ... }: 31 31 let 32 - user = nodes.machine.config.users.users.alice; 32 + user = nodes.machine.users.users.alice; 33 33 xdo = "${pkgs.xdotool}/bin/xdotool"; 34 34 in 35 35 '' 36 36 with subtest("Wait for login"): 37 37 start_all() 38 - machine.wait_for_file("/tmp/xauth_*") 39 - machine.succeed("xauth merge /tmp/xauth_*") 38 + machine.wait_for_file("/run/sddm/xauth_*") 39 + machine.sleep(1) 40 + machine.succeed("xauth merge /run/sddm/xauth_*") 40 41 41 42 with subtest("Check RetroArch started"): 42 43 machine.wait_until_succeeds("pgrep retroarch")
+2
nixos/tests/sddm.nix
··· 24 24 machine.screenshot("sddm") 25 25 machine.send_chars("${user.password}\n") 26 26 machine.wait_for_file("/tmp/xauth_*") 27 + machine.sleep(1) 27 28 machine.succeed("xauth merge /tmp/xauth_*") 28 29 machine.wait_for_window("^IceWM ") 29 30 ''; ··· 54 55 testScript = '' 55 56 start_all() 56 57 machine.wait_for_file("/tmp/xauth_*") 58 + machine.sleep(1) 57 59 machine.succeed("xauth merge /tmp/xauth_*") 58 60 machine.wait_for_window("^IceWM ") 59 61 '';