From ae1034ea965f9f86b6cbf1064071923650907618 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 23 Mar 2017 18:57:23 -0500 Subject: [PATCH] nixos/sddm: improve test Disable SDDM auto-login to improve testing for SDDM themes. See #24246. --- nixos/tests/sddm.nix | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 041d88fbeae6..a1bd8f14d23b 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -1,26 +1,24 @@ import ./make-test.nix ({ pkgs, ...} : { name = "sddm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ttuegel ]; - }; machine = { lib, ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; + services.xserver.displayManager.sddm.enable = true; services.xserver.windowManager.default = "icewm"; services.xserver.windowManager.icewm.enable = true; services.xserver.desktopManager.default = "none"; }; - testScript = { nodes, ... }: '' + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + in '' startAll; + $machine->waitForText(qr/ALICE/); + $machine->screenshot("sddm"); + $machine->sendChars("${user.password}\n"); $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow("^IceWM ");