From 0ec48ee05983a20c102603cc7abafe0c04e77477 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Aug 2023 16:56:26 +0800 Subject: [PATCH 1/2] nixos/tests/budgie: skip graphical-session.target check https://hydra.nixos.org/build/230010129/log --- nixos/tests/budgie.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index b1b0e618c884..34ee1e303de9 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -32,7 +32,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { in '' with subtest("Wait for login"): - machine.wait_for_x() + # wait_for_x() checks graphical-session.target, which is expected to be + # inactive on Budgie before #228946 (i.e. systemd managed gnome-session) is + # done on upstream. + # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/v10.7.2/src/session/budgie-desktop.in#L16 + # + # Previously this was unconditionally touched by xsessionWrapper but was + # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP). + # machine.wait_for_x() + machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"') machine.wait_for_file("${user.home}/.Xauthority") machine.succeed("xauth merge ${user.home}/.Xauthority") From 0c3697f511eea4fb52b22651eeab4d6a6d5bbb96 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Aug 2023 17:02:08 +0800 Subject: [PATCH 2/2] 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. --- nixos/tests/gnome-flashback.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 70569db797ec..876d36477c1a 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}")