summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-03-23 18:57:23 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-03-23 19:20:27 -0500
commitae1034ea965f9f86b6cbf1064071923650907618 (patch)
tree085243a8f611fb548977988254618f0dab98b121 /nixos
parent8e3d3b5328c0dbeeb1612f81efe051251c3c28c9 (diff)
downloadnixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar.gz
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar.bz2
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar.lz
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar.xz
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.tar.zst
nixpkgs-ae1034ea965f9f86b6cbf1064071923650907618.zip
nixos/sddm: improve test
Disable SDDM auto-login to improve testing for SDDM themes. See #24246.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/sddm.nix20
1 files changed, 9 insertions, 11 deletions
diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix
index 041d88fbeae..a1bd8f14d23 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 ");