commit ea3e5b125ccb0ea511da8becd2cd8843a2e56c5d · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1260
       1260
        
         sane = runTest ./sane.nix;

     

       1261
       1261
        
         sanoid = runTest ./sanoid.nix;

     

       1262
       1262
        
         saunafs = runTest ./saunafs.nix;

     

       1263
       1263
       -
         scaphandre = handleTest ./scaphandre.nix { };

     

       1263
       1263
       +
         scaphandre = runTest ./scaphandre.nix;

     

       1264
       1264
        
         schleuder = runTest ./schleuder.nix;

     

       1265
       1265
        
         scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { };

     

       1266
       1266
        
         scrutiny = runTest ./scrutiny.nix;

+13 -17

nixos/tests/scaphandre.nix

···

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

     

       1
       1
       +
       {

     

       2
       2
        
         name = "scaphandre";

     

       3
       3
        
       

     

       4
       4
       -
         nodes = {

     

       5
       5
       -
           scaphandre =

     

       6
       6
       -
             { pkgs, ... }:

     

       7
       7
       -
             {

     

       8
       8
       -
               boot.kernelModules = [ "intel_rapl_common" ];

     

       4
       4
       +
         nodes.scaphandre =

     

       5
       5
       +
           { pkgs, ... }:

     

       6
       6
       +
           {

     

       7
       7
       +
             boot.kernelModules = [ "intel_rapl_common" ];

     

       9
       8
        
       

     

       10
       10
       -
               environment.systemPackages = [ pkgs.scaphandre ];

     

       11
       11
       -
             };

     

       12
       12
       -
         };

     

       9
       9
       +
             environment.systemPackages = [ pkgs.scaphandre ];

     

       10
       10
       +
           };

     

       13
       11
        
       

     

       14
       14
       -
         testScript =

     

       15
       15
       -
           { nodes, ... }:

     

       16
       16
       -
           ''

     

       17
       17
       -
             scaphandre.start()

     

       18
       18
       -
             scaphandre.wait_until_succeeds(

     

       19
       19
       -
                 "scaphandre stdout -t 4",

     

       20
       20
       -
             )

     

       21
       21
       -
           '';

     

       12
       12
       +
         testScript = ''

     

       13
       13
       +
           scaphandre.start()

     

       14
       14
       +
           scaphandre.wait_until_succeeds(

     

       15
       15
       +
               "scaphandre stdout -t 4",

     

       16
       16
       +
           )

     

       17
       17
       +
         '';

     

       22
       18
        
       }