movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.xfce-wayland: migrate to runTest

Browse source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 23:34:36 +01:00
parent ead8dabde0
commit 93e131345f
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 55 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -1288,7 +1288,7 @@ in {
xandikos = handleTest ./xandikos.nix {}; xandikos = handleTest ./xandikos.nix {};
xautolock = handleTest ./xautolock.nix {}; xautolock = handleTest ./xautolock.nix {};
xfce = handleTest ./xfce.nix {}; xfce = handleTest ./xfce.nix {};
xfce-wayland = handleTest ./xfce-wayland.nix {}; xfce-wayland = runTest ./xfce-wayland.nix;
xmonad = runTest ./xmonad.nix; xmonad = runTest ./xmonad.nix;
xmonad-xdg-autostart = runTest ./xmonad-xdg-autostart.nix; xmonad-xdg-autostart = runTest ./xmonad-xdg-autostart.nix;
xpadneo = runTest ./xpadneo.nix; xpadneo = runTest ./xpadneo.nix;

111
nixos/tests/xfce-wayland.nix
View file

@ -1,71 +1,68 @@
import ./make-test-python.nix ( {
{ pkgs, ... }: name = "xfce-wayland";
{
name = "xfce-wayland";
nodes.machine = nodes.machine =
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
./common/user-account.nix ./common/user-account.nix
]; ];
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.displayManager.lightdm.enable = true; services.xserver.displayManager.lightdm.enable = true;
services.displayManager = { services.displayManager = {
defaultSession = "xfce-wayland"; defaultSession = "xfce-wayland";
autoLogin = { autoLogin = {
enable = true; enable = true;
user = "alice"; user = "alice";
};
}; };
services.xserver.desktopManager.xfce.enable = true;
services.xserver.desktopManager.xfce.enableWaylandSession = true;
environment.systemPackages = [ pkgs.wlrctl ];
}; };
enableOCR = true; services.xserver.desktopManager.xfce.enable = true;
services.xserver.desktopManager.xfce.enableWaylandSession = true;
environment.systemPackages = [ pkgs.wlrctl ];
};
testScript = enableOCR = true;
{ nodes, ... }:
let
user = nodes.machine.users.users.alice;
rtdir = "XDG_RUNTIME_DIR=/run/user/${toString user.uid}";
in
''
machine.wait_for_unit("display-manager.service")
with subtest("Wait for Wayland server"): testScript =
machine.wait_for_file("/run/user/${toString user.uid}/wayland-0") { nodes, ... }:
let
user = nodes.machine.users.users.alice;
rtdir = "XDG_RUNTIME_DIR=/run/user/${toString user.uid}";
in
''
machine.wait_for_unit("display-manager.service")
with subtest("Check that logging in has given the user ownership of devices"): with subtest("Wait for Wayland server"):
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
with subtest("Check if Xfce components actually start"): with subtest("Check that logging in has given the user ownership of devices"):
for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]: machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
machine.wait_until_succeeds(f"pgrep {p}")
with subtest("Open Xfce terminal"): with subtest("Check if Xfce components actually start"):
machine.succeed("su - ${user.name} -c '${rtdir} xfce4-terminal >&2 &'") for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]:
machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep xfce4-terminal'") machine.wait_until_succeeds(f"pgrep {p}")
with subtest("Open Thunar"): with subtest("Open Xfce terminal"):
machine.succeed("su - ${user.name} -c '${rtdir} thunar >&2 &'") machine.succeed("su - ${user.name} -c '${rtdir} xfce4-terminal >&2 &'")
machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep Thunar'") machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep xfce4-terminal'")
machine.wait_for_text('(Pictures|Public|Templates|Videos)')
with subtest("Check if various environment variables are set"): with subtest("Open Thunar"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf xfce4-panel)/environ" machine.succeed("su - ${user.name} -c '${rtdir} thunar >&2 &'")
machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'") machine.wait_until_succeeds("su - ${user.name} -c '${rtdir} wlrctl toplevel list | grep Thunar'")
machine.succeed(f"{cmd} | grep 'XFCE4_SESSION_COMPOSITOR' | grep 'labwc'") machine.wait_for_text('(Pictures|Public|Templates|Videos)')
machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'XFCE'")
with subtest("Check if any coredumps are found"): with subtest("Check if various environment variables are set"):
machine.succeed("(coredumpctl --json=short 2>&1 || true) | grep 'No coredumps found'") cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf xfce4-panel)/environ"
machine.sleep(10) machine.succeed(f"{cmd} | grep 'XDG_SESSION_TYPE' | grep 'wayland'")
machine.screenshot("screen") machine.succeed(f"{cmd} | grep 'XFCE4_SESSION_COMPOSITOR' | grep 'labwc'")
''; machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'XFCE'")
}
) with subtest("Check if any coredumps are found"):
machine.succeed("(coredumpctl --json=short 2>&1 || true) | grep 'No coredumps found'")
machine.sleep(10)
machine.screenshot("screen")
'';
}