diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index 632ab53cc529..d26d50dd9dc6 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -51,8 +51,9 @@ machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") with subtest("Check if Cinnamon components actually start"): - for i in ["csd-media-keys", "xapp-sn-watcher", "nemo-desktop"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + # https://unix.stackexchange.com/a/74186 + for i in ["[c]sd-media-keys", "[x]app-sn-watcher", "[n]emo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f \"{i}\"") machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") @@ -84,6 +85,10 @@ machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'") machine.sleep(2) + # Only can be tested after opening the above apps. + with subtest("Check if x-d-p actually starts"): + machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"") + with subtest("Check if Cinnamon has ever coredumped"): machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") ''; diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index d8b52c261a42..da8bf8847a4b 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -62,8 +62,9 @@ machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") with subtest("Check if Cinnamon components actually start"): - for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + # https://unix.stackexchange.com/a/74186 + for i in ["[c]sd-media-keys", "[c]innamon-killer-daemon", "[x]app-sn-watcher", "[n]emo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f \"{i}\"") machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") @@ -104,6 +105,10 @@ machine.sleep(2) machine.screenshot("cinnamon_virtual_keyboard") + # Only can be tested after opening the above apps. + with subtest("Check if x-d-p actually starts"): + machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"") + with subtest("Check if Cinnamon has ever coredumped"): machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") '';