nixos/tests: adjust everything I missed for sddm update

Also clean up a few warnings while we're at it.

K900 2fc57ae6 b840c45d

+3 -2
nixos/tests/maestral.nix
···
testScript = { nodes, ... }:
let
-
user = nodes.cli.config.users.users.alice;
+
user = nodes.cli.users.users.alice;
in
''
start_all()
···
with subtest("GUI"):
gui.wait_for_x()
-
gui.succeed("xauth merge ${user.home}/.Xauthority")
+
gui.wait_for_file("/tmp/xauth_*")
+
gui.succeed("xauth merge /tmp/xauth_*")
gui.wait_for_window("^Desktop ")
gui.wait_for_unit("maestral.service", "${user.name}")
'';
+3 -6
nixos/tests/plasma-bigscreen.nix
···
users.users.alice.extraGroups = ["uinput"];
};
-
testScript = { nodes, ... }: let
-
user = nodes.machine.users.users.alice;
-
xdo = "${pkgs.xdotool}/bin/xdotool";
-
in ''
+
testScript = { nodes, ... }: ''
with subtest("Wait for login"):
start_all()
-
machine.wait_for_file("${user.home}/.Xauthority")
-
machine.succeed("xauth merge ${user.home}/.Xauthority")
+
machine.wait_for_file("/tmp/xauth_*")
+
machine.succeed("xauth merge /tmp/xauth_*")
with subtest("Check plasmashell started"):
machine.wait_until_succeeds("pgrep plasmashell")
+3 -5
nixos/tests/plasma5-systemd-start.nix
···
};
};
-
testScript = { nodes, ... }: let
-
user = nodes.machine.config.users.users.alice;
-
in ''
+
testScript = { nodes, ... }: ''
with subtest("Wait for login"):
start_all()
-
machine.wait_for_file("${user.home}/.Xauthority")
-
machine.succeed("xauth merge ${user.home}/.Xauthority")
+
machine.wait_for_file("/tmp/xauth_*")
+
machine.succeed("xauth merge /tmp/xauth_*")
with subtest("Check plasmashell started"):
machine.wait_until_succeeds("pgrep plasmashell")
+7 -7
nixos/tests/plasma5.nix
···
services.xserver.enable = true;
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.defaultSession = "plasma";
-
services.xserver.desktopManager.plasma5 = {
-
enable = true;
-
excludePackages = [ pkgs.plasma5Packages.elisa ];
-
};
+
services.xserver.desktopManager.plasma5.enable = true;
+
environment.plasma5.excludePackages = [ pkgs.plasma5Packages.elisa ];
services.xserver.displayManager.autoLogin = {
enable = true;
user = "alice";
···
};
testScript = { nodes, ... }: let
-
user = nodes.machine.config.users.users.alice;
+
user = nodes.machine.users.users.alice;
xdo = "${pkgs.xdotool}/bin/xdotool";
in ''
with subtest("Wait for login"):
start_all()
-
machine.wait_for_file("${user.home}/.Xauthority")
-
machine.succeed("xauth merge ${user.home}/.Xauthority")
+
machine.wait_for_file("/tmp/xauth_*")
+
machine.succeed("xauth merge /tmp/xauth_*")
with subtest("Check plasmashell started"):
machine.wait_until_succeeds("pgrep plasmashell")
···
with subtest("Ensure Elisa is not installed"):
machine.fail("which elisa")
+
+
machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
with subtest("Run Dolphin"):
machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")
+2 -2
nixos/tests/retroarch.nix
···
in ''
with subtest("Wait for login"):
start_all()
-
machine.wait_for_file("${user.home}/.Xauthority")
-
machine.succeed("xauth merge ${user.home}/.Xauthority")
+
machine.wait_for_file("/tmp/xauth_*")
+
machine.succeed("xauth merge /tmp/xauth_*")
with subtest("Check RetroArch started"):
machine.wait_until_succeeds("pgrep retroarch")