commit 650ab40c8146822cdb76f1b8eb72c60a9dcf825d · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1295
       1295
        
         xrdp = handleTest ./xrdp.nix {};

     

       1296
       1296
        
         xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {};

     

       1297
       1297
        
         xscreensaver = handleTest ./xscreensaver.nix {};

     

       1298
       1298
       -
         xss-lock = handleTest ./xss-lock.nix {};

     

       1298
       1298
       +
         xss-lock = runTest ./xss-lock.nix;

     

       1299
       1299
        
         xterm = runTest ./xterm.nix;

     

       1300
       1300
        
         xxh = runTest ./xxh.nix;

     

       1301
       1301
        
         yabar = runTest ./yabar.nix;

+38 -41

nixos/tests/xss-lock.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "xss-lock";

     

       5
       5
       -
           meta.maintainers = [ ];

     

       1
       1
       +
       {

     

       2
       2
       +
         name = "xss-lock";

     

       3
       3
       +
         meta.maintainers = [ ];

     

       6
       4
        
       

     

       7
       7
       -
           nodes = {

     

       8
       8
       -
             simple = {

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           simple = {

     

       7
       7
       +
             imports = [

     

       8
       8
       +
               ./common/x11.nix

     

       9
       9
       +
               ./common/user-account.nix

     

       10
       10
       +
             ];

     

       11
       11
       +
             programs.xss-lock.enable = true;

     

       12
       12
       +
             test-support.displayManager.auto.user = "alice";

     

       13
       13
       +
           };

     

       14
       14
       +
       

     

       15
       15
       +
           custom_lockcmd =

     

       16
       16
       +
             { pkgs, ... }:

     

       17
       17
       +
             {

     

       9
       18
        
               imports = [

     

       10
       19
        
                 ./common/x11.nix

     

       11
       20
        
                 ./common/user-account.nix

     

       12
       21
        
               ];

     

       13
       13
       -
               programs.xss-lock.enable = true;

     

       14
       22
        
               test-support.displayManager.auto.user = "alice";

     

       15
       15
       -
             };

     

       16
       23
        
       

     

       17
       17
       -
             custom_lockcmd =

     

       18
       18
       -
               { pkgs, ... }:

     

       19
       19
       -
               {

     

       20
       20
       -
                 imports = [

     

       21
       21
       -
                   ./common/x11.nix

     

       22
       22
       -
                   ./common/user-account.nix

     

       24
       24
       +
               programs.xss-lock = {

     

       25
       25
       +
                 enable = true;

     

       26
       26
       +
                 extraOptions = [

     

       27
       27
       +
                   "-n"

     

       28
       28
       +
                   "${pkgs.libnotify}/bin/notify-send 'About to sleep!'"

     

       23
       29
        
                 ];

     

       24
       24
       -
                 test-support.displayManager.auto.user = "alice";

     

       25
       25
       -
       

     

       26
       26
       -
                 programs.xss-lock = {

     

       27
       27
       -
                   enable = true;

     

       28
       28
       -
                   extraOptions = [

     

       29
       29
       -
                     "-n"

     

       30
       30
       -
                     "${pkgs.libnotify}/bin/notify-send 'About to sleep!'"

     

       31
       31
       -
                   ];

     

       32
       32
       -
                   lockerCommand = "${pkgs.xlockmore}/bin/xlock -mode ant";

     

       33
       33
       -
                 };

     

       30
       30
       +
                 lockerCommand = "${pkgs.xlockmore}/bin/xlock -mode ant";

     

       34
       31
        
               };

     

       35
       35
       -
           };

     

       32
       32
       +
             };

     

       33
       33
       +
         };

     

       36
       34
        
       

     

       37
       37
       -
           testScript = ''

     

       38
       38
       -
             def perform_xsslock_test(machine, lockCmd):

     

       39
       39
       -
                 machine.start()

     

       40
       40
       -
                 machine.wait_for_x()

     

       41
       41
       -
                 machine.wait_for_unit("xss-lock.service", "alice")

     

       42
       42
       -
                 machine.fail(f"pgrep {lockCmd}")

     

       43
       43
       -
                 machine.succeed("su -l alice -c 'xset dpms force standby'")

     

       44
       44
       -
                 machine.wait_until_succeeds(f"pgrep {lockCmd}")

     

       35
       35
       +
         testScript = ''

     

       36
       36
       +
           def perform_xsslock_test(machine, lockCmd):

     

       37
       37
       +
               machine.start()

     

       38
       38
       +
               machine.wait_for_x()

     

       39
       39
       +
               machine.wait_for_unit("xss-lock.service", "alice")

     

       40
       40
       +
               machine.fail(f"pgrep {lockCmd}")

     

       41
       41
       +
               machine.succeed("su -l alice -c 'xset dpms force standby'")

     

       42
       42
       +
               machine.wait_until_succeeds(f"pgrep {lockCmd}")

     

       45
       43
        
       

     

       46
       44
        
       

     

       47
       47
       -
             with subtest("simple"):

     

       48
       48
       -
                 perform_xsslock_test(simple, "i3lock")

     

       45
       45
       +
           with subtest("simple"):

     

       46
       46
       +
               perform_xsslock_test(simple, "i3lock")

     

       49
       47
        
       

     

       50
       50
       -
             with subtest("custom_cmd"):

     

       51
       51
       -
                 perform_xsslock_test(custom_lockcmd, "xlock")

     

       52
       52
       -
           '';

     

       53
       53
       -
         }

     

       54
       54
       -
       )

     

       48
       48
       +
           with subtest("custom_cmd"):

     

       49
       49
       +
               perform_xsslock_test(custom_lockcmd, "xlock")

     

       50
       50
       +
         '';

     

       51
       51
       +
       }