diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-08-02 17:02:08 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-08-03 09:52:12 +0800 |
| commit | 0c3697f511eea4fb52b22651eeab4d6a6d5bbb96 (patch) | |
| tree | 9a3a288b9538dc3d32bd5a20aa4b63b31fbee9af /nixos/tests/gnome-flashback.nix | |
| parent | 0ec48ee05983a20c102603cc7abafe0c04e77477 (diff) | |
nixos/tests/gnome-flashback: skip graphical-session.target check
https://hydra.nixos.org/build/230009507/log Also silence warning: Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead.
Diffstat (limited to 'nixos/tests/gnome-flashback.nix')
| -rw-r--r-- | nixos/tests/gnome-flashback.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 70569db797ec9..876d36477c1a9 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { nodes.machine = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in { imports = [ ./common/user-account.nix ]; @@ -27,12 +27,20 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; uid = toString user.uid; xauthority = "/run/user/${uid}/gdm/Xauthority"; in '' with subtest("Login to GNOME Flashback with GDM"): - machine.wait_for_x() + # 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_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}") machine.wait_for_file("${xauthority}") |