movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2023-11-24 12:01:44 +00:00 • committed by GitHub
commit f4335ece6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 777 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -927,6 +927,7 @@ in {
xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};
xpadneo = handleTest ./xpadneo.nix {};
xrdp = handleTest ./xrdp.nix {};
xscreensaver = handleTest ./xscreensaver.nix {};
xss-lock = handleTest ./xss-lock.nix {};
xterm = handleTest ./xterm.nix {};
xxh = handleTest ./xxh.nix {};

64
nixos/tests/xscreensaver.nix Normal file
View file

@ -0,0 +1,64 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "pass-secret-service";
meta.maintainers = with lib.maintainers; [ vancluever AndersonTorres ];
nodes = {
ok = { nodes, pkgs, ... }:
{
imports = [ ./common/x11.nix ./common/user-account.nix ];
test-support.displayManager.auto.user = "alice";
services.xscreensaver.enable = true;
};
empty_wrapperPrefix = { nodes, pkgs, ... }:
{
imports = [ ./common/x11.nix ./common/user-account.nix ];
test-support.displayManager.auto.user = "alice";
services.xscreensaver.enable = true;
nixpkgs.overlays = [
(self: super: {
xscreensaver = super.xscreensaver.override {
wrapperPrefix = "";
};
})
];
};
bad_wrapperPrefix = { nodes, pkgs, ... }:
{
imports = [ ./common/x11.nix ./common/user-account.nix ];
test-support.displayManager.auto.user = "alice";
services.xscreensaver.enable = true;
nixpkgs.overlays = [
(self: super: {
xscreensaver = super.xscreensaver.override {
wrapperPrefix = "/a/bad/path";
};
})
];
};
};
testScript = ''
ok.wait_for_x()
ok.wait_for_unit("xscreensaver", "alice")
_, output_ok = ok.systemctl("status xscreensaver", "alice")
assert 'To prevent the kernel from randomly unlocking' not in output_ok
assert 'your screen via the out-of-memory killer' not in output_ok
assert '"xscreensaver-auth" must be setuid root' not in output_ok
empty_wrapperPrefix.wait_for_x()
empty_wrapperPrefix.wait_for_unit("xscreensaver", "alice")
_, output_empty_wrapperPrefix = empty_wrapperPrefix.systemctl("status xscreensaver", "alice")
assert 'To prevent the kernel from randomly unlocking' in output_empty_wrapperPrefix
assert 'your screen via the out-of-memory killer' in output_empty_wrapperPrefix
assert '"xscreensaver-auth" must be setuid root' in output_empty_wrapperPrefix
bad_wrapperPrefix.wait_for_x()
bad_wrapperPrefix.wait_for_unit("xscreensaver", "alice")
_, output_bad_wrapperPrefix = bad_wrapperPrefix.systemctl("status xscreensaver", "alice")
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
'';
})