about summary refs log tree commit diff
path: root/nixos/tests/gnome-flashback.nix
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-10-06 18:18:23 +0800
committerBobby Rong <rjl931189261@126.com>2023-10-06 18:39:10 +0800
commit3db8e68328de7e56d03d609907185a0aca18d3f2 (patch)
tree6b6b9d65d593b2cbeb11e812b3fbda42c9d86d3f /nixos/tests/gnome-flashback.nix
parentad65c25dfb3acfe9526d05e5c66a15ee9cec5524 (diff)
nixos/tests/gnome-flashback: Restore wait_for_x test
Should be passing now.
Diffstat (limited to 'nixos/tests/gnome-flashback.nix')
-rw-r--r--nixos/tests/gnome-flashback.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix
index 3e59e3fc03409..f486dabc5c40b 100644
--- a/nixos/tests/gnome-flashback.nix
+++ b/nixos/tests/gnome-flashback.nix
@@ -32,14 +32,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
     xauthority = "/run/user/${uid}/gdm/Xauthority";
   in ''
       with subtest("Login to GNOME Flashback with GDM"):
-          # wait_for_x() checks graphical-session.target, which is expected to be
-          # inactive on gnome-flashback before #228946 (i.e. systemd managed
-          # gnome-session) is done.
-          # https://github.com/NixOS/nixpkgs/pull/208060
-          #
-          # Previously this was unconditionally touched by xsessionWrapper but was
-          # changed in #233981 (we have GNOME-Flashback:GNOME in XDG_CURRENT_DESKTOP).
-          # machine.wait_for_x()
+          machine.wait_for_x()
           machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
           # Wait for alice to be logged in"
           machine.wait_for_unit("default.target", "${user.name}")