about summary refs log tree commit diff
path: root/nixos/tests/gnome3.nix
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-06-09 22:02:48 +0200
committerGitHub <noreply@github.com>2018-06-09 22:02:48 +0200
commit08197d032a221bdb4c4d423a6544442ad12b798f (patch)
tree69fc3b560a17ab3f0a5ec719efa62a4eacae87a0 /nixos/tests/gnome3.nix
parent79511c84344d539cd64ec0f3c836450a4d04156d (diff)
nixos/tests/gnome3: switch to lightdm (#41742)
Diffstat (limited to 'nixos/tests/gnome3.nix')
-rw-r--r--nixos/tests/gnome3.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 492fa61484a0f..591ed8600685f 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,8 +11,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 1024;
@@ -21,7 +22,9 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(15);
+
+      # wait for alice to be logged in
+      $machine->waitForUnit("default.target","alice");
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");