summary refs log tree commit diff
path: root/nixos/tests/gnome3.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-01-30 06:14:22 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2020-01-30 17:51:01 -0500
commit7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c (patch)
tree2d01a714cf27ccfd0d88b90bd9ff511ad5446b02 /nixos/tests/gnome3.nix
parent9888b30924db834a10bba1136a832229d91b45ec (diff)
downloadnixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar.gz
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar.bz2
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar.lz
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar.xz
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.tar.zst
nixpkgs-7651fcfe48c79c3bff7cfcc2063b54abf5d7fc1c.zip
nixosTests.gnome3: wait_for_wayland at login
This prevents the default.target check from just failing.
Blaming it on using systemctl in wait_for_unit (and it's particularly
buggy for user units).
Diffstat (limited to 'nixos/tests/gnome3.nix')
-rw-r--r--nixos/tests/gnome3.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 37e4f1680b7..486c146d8dc 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -49,14 +49,14 @@ import ./make-test-python.nix ({ pkgs, ...} : {
       with subtest("Login to GNOME with GDM"):
           # wait for gdm to start
           machine.wait_for_unit("display-manager.service")
+          # wait for the wayland server
+          machine.wait_for_file("/run/user/${uid}/wayland-0")
           # wait for alice to be logged in
           machine.wait_for_unit("default.target", "${user.name}")
           # check that logging in has given the user ownership of devices
           assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
 
       with subtest("Wait for GNOME Shell"):
-          # wait for the wayland server
-          machine.wait_for_file("/run/user/${uid}/wayland-0")
           # correct output should be (true, 'false')
           machine.wait_until_succeeds(
               "${startingUp} | grep -q 'true,..false'"