mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 17:03:01 +00:00
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.
This commit is contained in:
parent
0ec48ee059
commit
0c3697f511
@ -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}")
|
||||
|
Loading…
Reference in New Issue
Block a user