diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix index a6c40f6a9ab4..b003e1c65240 100644 --- a/nixos/tests/budgie.nix +++ b/nixos/tests/budgie.nix @@ -54,7 +54,8 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if Budgie session components actually start"): for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]: diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index d19ac920b388..e4118d82f4dd 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -42,7 +42,8 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 9ff43a8dbbb7..1f8fb683efc7 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -53,7 +53,8 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Wait for the Cinnamon shell"): # Correct output should be (true, '2') diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index 77e731feddbf..41dfc754e7fe 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -42,7 +42,8 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("First time wizard"): machine.wait_for_text("Default") # Language diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index bde20a8c95aa..66003daa09d9 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -105,7 +105,8 @@ # 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") + # Change back to /dev/snd/timer after systemd-258.1 + assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix index 6df6e621995e..46cb6402bbb1 100644 --- a/nixos/tests/gnome-flashback.nix +++ b/nixos/tests/gnome-flashback.nix @@ -46,7 +46,8 @@ machine.wait_for_file("${xauthority}") machine.succeed("xauth merge ${xauthority}") # Check that logging in has given the user ownership of devices - assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") + # Change back to /dev/snd/timer after systemd-258.1 + assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") with subtest("Wait for Metacity"): machine.wait_until_succeeds("pgrep metacity") diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix index 82d3bf3e08ce..9e9fdc9bdb9f 100644 --- a/nixos/tests/gnome-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -83,7 +83,8 @@ machine.wait_for_file("${xauthority}") machine.succeed("xauth merge ${xauthority}") # Check that logging in has given the user ownership of devices - assert "alice" in machine.succeed("getfacl -p /dev/snd/timer") + # Change back to /dev/snd/timer after systemd-258.1 + assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix index 4d1b4c71ecd2..0bb2e7061133 100644 --- a/nixos/tests/gnome.nix +++ b/nixos/tests/gnome.nix @@ -76,7 +76,8 @@ # 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") + # Change back to /dev/snd/timer after systemd-258.1 + assert "alice" in machine.succeed("getfacl -p /dev/dri/card0") with subtest("Wait for GNOME Shell"): # correct output should be (true, 'false') diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix index 595b6dc3f9ba..a7b8120016aa 100644 --- a/nixos/tests/lxqt.nix +++ b/nixos/tests/lxqt.nix @@ -42,7 +42,8 @@ machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if LXQt components actually start"): for i in ["openbox", "lxqt-session", "pcmanfm-qt", "lxqt-panel", "lxqt-runner"]: diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix index 45fd877c1ca4..81948d5a1ae1 100644 --- a/nixos/tests/mate.nix +++ b/nixos/tests/mate.nix @@ -41,7 +41,8 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if MATE session components actually start"): machine.wait_until_succeeds("pgrep marco") diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 336f84a061b4..3e24bff88527 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -72,7 +72,8 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if Pantheon components actually start"): pgrep_list = [ diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix index 17defe1b4d26..061efa002327 100644 --- a/nixos/tests/xfce-wayland.nix +++ b/nixos/tests/xfce-wayland.nix @@ -39,7 +39,8 @@ machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if Xfce components actually start"): for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]: diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 0b88fb18870f..cdd1f3ffc676 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -38,7 +38,8 @@ machine.succeed("xauth merge ${user.home}/.Xauthority") with subtest("Check that logging in has given the user ownership of devices"): - machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + # Change back to /dev/snd/timer after systemd-258.1 + machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}") with subtest("Check if Xfce components actually start"): machine.wait_for_window("xfce4-panel")