diff options
author | K900 <me@0upti.me> | 2023-07-09 18:12:27 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2023-07-09 18:49:28 +0300 |
commit | 2fc57ae6702b9f74d18a8cd94746962816984904 (patch) | |
tree | 42120833ddbbb1fca6f667e6b682436410adc2fe /nixos/tests/plasma5.nix | |
parent | b840c45d39acb59fa348945a2a8e7e442b529efd (diff) |
nixos/tests: adjust everything I missed for sddm update
Also clean up a few warnings while we're at it.
Diffstat (limited to 'nixos/tests/plasma5.nix')
-rw-r--r-- | nixos/tests/plasma5.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index b3836cf641d4b..fb8a5b73832ea 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -13,10 +13,8 @@ import ./make-test-python.nix ({ pkgs, ...} : 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"; @@ -25,13 +23,13 @@ import ./make-test-python.nix ({ pkgs, ...} : }; 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") @@ -46,6 +44,8 @@ import ./make-test-python.nix ({ pkgs, ...} : 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 &'") machine.wait_for_window(" Dolphin") |