commit ab51a2dbd6b5fcc8f6ae467075a2863ecac7c7d0 · pyrox.dev/nixpkgs

nixos/modules/programs/atop.nix

···

       19
       19
        
             package = mkOption {

     

       20
       20
        
               type = types.package;

     

       21
       21
        
               default = pkgs.atop;

     

       22
       22
       +
               defaultText = "pkgs.atop";

     

       22
       23
        
               description = ''

     

       23
       24
        
                 Which package to use for Atop.

     

       24
       25
        
               '';

     
···

       36
       37
        
               package = mkOption {

     

       37
       38
        
                 type = types.package;

     

       38
       39
        
                 default = config.boot.kernelPackages.netatop;

     

       40
       40
       +
                 defaultText = "config.boot.kernelPackages.netatop";

     

       39
       41
        
                 description = ''

     

       40
       42
        
                   Which package to use for netatop.

     

       41
       43
        
                 '';

+30 -7

nixos/tests/atop.nix

···

       14
       14
        
         '';

     

       15
       15
        
         unit = name: state: ''

     

       16
       16
        
           with subtest("Unit ${name} should be ${state}"):

     

       17
       17
       -
               machine.require_unit_state("${name}", "${state}")

     

       17
       17
       +
               if "${state}" == "active":

     

       18
       18
       +
                   machine.wait_for_unit("${name}")

     

       19
       19
       +
               else:

     

       20
       20
       +
                   machine.require_unit_state("${name}", "${state}")

     

       18
       21
        
         '';

     

       19
       22
        
         version = ''

     

       20
       23
        
           import re

     
···

       44
       47
        
           if present then

     

       45
       48
        
             unit "atop.service" "active"

     

       46
       49
        
             + ''

     

       47
       47
       -
               with subtest("atop.service should have written some data to /var/log/atop"):

     

       48
       48
       -
                   files = int(machine.succeed("ls -1 /var/log/atop | wc -l"))

     

       49
       49
       -
                   assert files > 0, "Expected at least 1 data file"

     

       50
       50
       +
               with subtest("atop.service should write some data to /var/log/atop"):

     

       51
       51
       +
       

     

       52
       52
       +
                   def has_data_files(last: bool) -> bool:

     

       53
       53
       +
                       files = int(machine.succeed("ls -1 /var/log/atop | wc -l"))

     

       54
       54
       +
                       if files == 0:

     

       55
       55
       +
                           machine.log("Did not find at least one 1 data file")

     

       56
       56
       +
                           if not last:

     

       57
       57
       +
                               machine.log("Will retry...")

     

       58
       58
       +
                           return False

     

       59
       59
       +
                       return True

     

       60
       60
       +
       

     

       61
       61
       +
                   with machine.nested("Waiting for data files"):

     

       62
       62
       +
                       retry(has_data_files)

     

       50
       63
        
             '' else unit "atop.service" "inactive";

     

       51
       64
        
         atopRotateTimer = present:

     

       52
       65
        
           unit "atop-rotate.timer" (if present then "active" else "inactive");

     
···

       55
       68
        
             unit "atopacct.service" "active"

     

       56
       69
        
             + ''

     

       57
       70
        
               with subtest("atopacct.service should enable process accounting"):

     

       58
       58
       -
                   machine.succeed("test -f /run/pacct_source")

     

       71
       71
       +
                   machine.wait_until_succeeds("test -f /run/pacct_source")

     

       59
       72
        
       

     

       60
       73
        
               with subtest("atopacct.service should write data to /run/pacct_shadow.d"):

     

       61
       61
       -
                   files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l"))

     

       62
       62
       -
                   assert files >= 1, "Expected at least 1 pacct_shadow.d file"

     

       74
       74
       +
       

     

       75
       75
       +
                   def has_data_files(last: bool) -> bool:

     

       76
       76
       +
                       files = int(machine.succeed("ls -1 /run/pacct_shadow.d | wc -l"))

     

       77
       77
       +
                       if files == 0:

     

       78
       78
       +
                           machine.log("Did not find at least one 1 data file")

     

       79
       79
       +
                           if not last:

     

       80
       80
       +
                               machine.log("Will retry...")

     

       81
       81
       +
                           return False

     

       82
       82
       +
                       return True

     

       83
       83
       +
       

     

       84
       84
       +
                   with machine.nested("Waiting for data files"):

     

       85
       85
       +
                       retry(has_data_files)

     

       63
       86
        
             '' else unit "atopacct.service" "inactive";

     

       64
       87
        
         netatop = present:

     

       65
       88
        
           if present then