From eec3fb0c3a5d7b3852a9f60d37bab1d424555733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sun, 9 Nov 2025 09:47:33 +0800 Subject: [PATCH] nixosTests.xscreensaver: ensure hooks script behaviour --- nixos/tests/xscreensaver.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/tests/xscreensaver.nix b/nixos/tests/xscreensaver.nix index 27f496cb9def..9b62bdab07d2 100644 --- a/nixos/tests/xscreensaver.nix +++ b/nixos/tests/xscreensaver.nix @@ -1,6 +1,6 @@ { lib, ... }: { - name = "pass-secret-service"; + name = "xscreensaver"; meta.maintainers = with lib.maintainers; [ vancluever ]; @@ -54,9 +54,25 @@ }) ]; }; + + hooks = + { lib, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; + services.xscreensaver = { + enable = true; + hooks = { + "UNBLANK" = ":> /home/alice/xscreensaver-works"; + }; + }; + }; }; - testScript = '' + testScript = /* python */ '' ok.wait_for_x() ok.wait_for_unit("xscreensaver", "alice") _, output_ok = ok.systemctl("status xscreensaver", "alice") @@ -77,5 +93,10 @@ assert 'To prevent the kernel from randomly unlocking' in output_bad_wrapperPrefix assert 'your screen via the out-of-memory killer' in output_bad_wrapperPrefix assert '"xscreensaver-auth" must be setuid root' in output_bad_wrapperPrefix + + hooks.wait_for_x() + hooks.wait_for_unit("xscreensaver", "alice") + hooks.wait_for_unit("xscreensaver-hooks", "alice") + hooks.wait_for_file("/home/alice/xscreensaver-works") ''; }