diff options
| author | Tert0 <tert0byte@gmail.com> | 2025-01-31 14:03:32 +0100 |
|---|---|---|
| committer | Wolfgang Walther <walther@technowledgy.de> | 2025-02-08 21:29:15 +0100 |
| commit | 02123e894a08076f9447bbb63f049bc1b92841e3 (patch) | |
| tree | 90d26306ffc2adab99490a2385d216554a6d2d5a | |
| parent | swaylock,swaybg: fix svg support (diff) | |
| download | nixpkgs-origin/backport-378270-to-release-24.11.tar.gz | |
nixos/tests/{sway,swayfx}: fix pgrep commands to match wrapped swaylockorigin/backport-378270-to-release-24.11
(cherry picked from commit 71ce1c341318bd839f0f5256d7f42621ab0e6aab)
| -rw-r--r-- | nixos/tests/sway.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/swayfx.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 13fa5dacbd92..75035c5b9f65 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -192,15 +192,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.config.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; } diff --git a/nixos/tests/swayfx.nix b/nixos/tests/swayfx.nix index fe1caf8fffa8..a3e30ca7407d 100644 --- a/nixos/tests/swayfx.nix +++ b/nixos/tests/swayfx.nix @@ -192,15 +192,15 @@ import ./make-test-python.nix ( machine.screenshot("sway_exit") swaymsg("exec swaylock") - machine.wait_until_succeeds("pgrep -x swaylock") + machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) machine.send_chars("${nodes.machine.config.users.users.alice.password}") machine.send_key("ret") - machine.wait_until_fails("pgrep -x swaylock") + machine.wait_until_fails("pgrep -xf swaylock") # Exit Sway and verify process exit status 0: swaymsg("exit", succeed=False) - machine.wait_until_fails("pgrep -x sway") + machine.wait_until_fails("pgrep -xf sway") machine.wait_for_file("/tmp/sway-exit-ok") ''; } |