Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixosTests.xautolock: migrate to runTest

Part Of #386873

Changed files
+21 -25
nixos
+1 -1
nixos/tests/all-tests.nix
··· 1286 1286 writefreely = handleTest ./web-apps/writefreely.nix {}; 1287 1287 wstunnel = runTest ./wstunnel.nix; 1288 1288 xandikos = handleTest ./xandikos.nix {}; 1289 - xautolock = handleTest ./xautolock.nix {}; 1289 + xautolock = runTest ./xautolock.nix; 1290 1290 xfce = runTest ./xfce.nix; 1291 1291 xfce-wayland = runTest ./xfce-wayland.nix; 1292 1292 xmonad = runTest ./xmonad.nix;
+20 -24
nixos/tests/xautolock.nix
··· 1 - import ./make-test-python.nix ( 2 - { pkgs, lib, ... }: 1 + { 2 + name = "xautolock"; 3 + meta.maintainers = [ ]; 3 4 4 - { 5 - name = "xautolock"; 6 - meta.maintainers = [ ]; 7 - 8 - nodes.machine = { 9 - imports = [ 10 - ./common/x11.nix 11 - ./common/user-account.nix 12 - ]; 5 + nodes.machine = { 6 + imports = [ 7 + ./common/x11.nix 8 + ./common/user-account.nix 9 + ]; 13 10 14 - test-support.displayManager.auto.user = "bob"; 15 - services.xserver.xautolock.enable = true; 16 - services.xserver.xautolock.time = 1; 17 - }; 11 + test-support.displayManager.auto.user = "bob"; 12 + services.xserver.xautolock.enable = true; 13 + services.xserver.xautolock.time = 1; 14 + }; 18 15 19 - testScript = '' 20 - machine.start() 21 - machine.wait_for_x() 22 - machine.fail("pgrep xlock") 23 - machine.sleep(120) 24 - machine.succeed("pgrep xlock") 25 - ''; 26 - } 27 - ) 16 + testScript = '' 17 + machine.start() 18 + machine.wait_for_x() 19 + machine.fail("pgrep xlock") 20 + machine.sleep(120) 21 + machine.succeed("pgrep xlock") 22 + ''; 23 + }