nixosTests.xautolock: migrate to runTest

Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 23:35:56 +01:00
parent f7a4d10a08
commit ae0871bca2
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 21 additions and 25 deletions

View file

@ -1286,7 +1286,7 @@ in {
writefreely = handleTest ./web-apps/writefreely.nix {}; writefreely = handleTest ./web-apps/writefreely.nix {};
wstunnel = runTest ./wstunnel.nix; wstunnel = runTest ./wstunnel.nix;
xandikos = handleTest ./xandikos.nix {}; xandikos = handleTest ./xandikos.nix {};
xautolock = handleTest ./xautolock.nix {}; xautolock = runTest ./xautolock.nix;
xfce = runTest ./xfce.nix; xfce = runTest ./xfce.nix;
xfce-wayland = runTest ./xfce-wayland.nix; xfce-wayland = runTest ./xfce-wayland.nix;
xmonad = runTest ./xmonad.nix; xmonad = runTest ./xmonad.nix;

View file

@ -1,27 +1,23 @@
import ./make-test-python.nix ( {
{ pkgs, lib, ... }: name = "xautolock";
meta.maintainers = [ ];
{ nodes.machine = {
name = "xautolock"; imports = [
meta.maintainers = [ ]; ./common/x11.nix
./common/user-account.nix
];
nodes.machine = { test-support.displayManager.auto.user = "bob";
imports = [ services.xserver.xautolock.enable = true;
./common/x11.nix services.xserver.xautolock.time = 1;
./common/user-account.nix };
];
test-support.displayManager.auto.user = "bob"; testScript = ''
services.xserver.xautolock.enable = true; machine.start()
services.xserver.xautolock.time = 1; machine.wait_for_x()
}; machine.fail("pgrep xlock")
machine.sleep(120)
testScript = '' machine.succeed("pgrep xlock")
machine.start() '';
machine.wait_for_x() }
machine.fail("pgrep xlock")
machine.sleep(120)
machine.succeed("pgrep xlock")
'';
}
)