commit 2e4fac6dfdbc71b35708aef46c546b2dd2ae38b4 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       283
       283
        
         buildkite-agents = runTest ./buildkite-agents.nix;

     

       284
       284
        
         c2fmzq = runTest ./c2fmzq.nix;

     

       285
       285
        
         caddy = runTest ./caddy.nix;

     

       286
       286
       -
         cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };

     

       286
       286
       +
         cadvisor = runTestOn [ "x86_64-linux" ] ./cadvisor.nix;

     

       287
       287
        
         cage = runTest ./cage.nix;

     

       288
       288
        
         cagebreak = runTest ./cagebreak.nix;

     

       289
       289
        
         calibre-web = runTest ./calibre-web.nix;

+26 -32

nixos/tests/cadvisor.nix

···

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

     

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

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "cadvisor";

     

       5
       5
       -
           meta.maintainers = with lib.maintainers; [ offline ];

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "cadvisor";

     

       4
       4
       +
         meta.maintainers = with lib.maintainers; [ offline ];

     

       6
       5
        
       

     

       7
       7
       -
           nodes = {

     

       8
       8
       -
             machine =

     

       9
       9
       -
               { ... }:

     

       10
       10
       -
               {

     

       11
       11
       -
                 services.cadvisor.enable = true;

     

       12
       12
       -
               };

     

       6
       6
       +
         nodes = {

     

       7
       7
       +
           machine = {

     

       8
       8
       +
             services.cadvisor.enable = true;

     

       9
       9
       +
           };

     

       13
       10
        
       

     

       14
       14
       -
             influxdb =

     

       15
       15
       -
               { lib, ... }:

     

       16
       16
       -
               {

     

       17
       17
       -
                 services.cadvisor.enable = true;

     

       18
       18
       -
                 services.cadvisor.storageDriver = "influxdb";

     

       19
       19
       -
                 services.influxdb.enable = true;

     

       20
       20
       -
               };

     

       11
       11
       +
           influxdb = {

     

       12
       12
       +
             services.cadvisor.enable = true;

     

       13
       13
       +
             services.cadvisor.storageDriver = "influxdb";

     

       14
       14
       +
             services.influxdb.enable = true;

     

       21
       15
        
           };

     

       16
       16
       +
         };

     

       22
       17
        
       

     

       23
       23
       -
           testScript = ''

     

       24
       24
       -
             start_all()

     

       25
       25
       -
             machine.wait_for_unit("cadvisor.service")

     

       26
       26
       -
             machine.succeed("curl -f http://localhost:8080/containers/")

     

       18
       18
       +
         testScript = ''

     

       19
       19
       +
           start_all()

     

       20
       20
       +
           machine.wait_for_unit("cadvisor.service")

     

       21
       21
       +
           machine.succeed("curl -f http://localhost:8080/containers/")

     

       27
       22
        
       

     

       28
       28
       -
             influxdb.wait_for_unit("influxdb.service")

     

       23
       23
       +
           influxdb.wait_for_unit("influxdb.service")

     

       29
       24
        
       

     

       30
       30
       -
             # create influxdb database

     

       31
       31
       -
             influxdb.succeed(

     

       32
       32
       -
                 'curl -f -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"'

     

       33
       33
       -
             )

     

       25
       25
       +
           # create influxdb database

     

       26
       26
       +
           influxdb.succeed(

     

       27
       27
       +
               'curl -f -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root"'

     

       28
       28
       +
           )

     

       34
       29
        
       

     

       35
       35
       -
             influxdb.wait_for_unit("cadvisor.service")

     

       36
       36
       -
             influxdb.succeed("curl -f http://localhost:8080/containers/")

     

       37
       37
       -
           '';

     

       38
       38
       -
         }

     

       39
       39
       -
       )

     

       30
       30
       +
           influxdb.wait_for_unit("cadvisor.service")

     

       31
       31
       +
           influxdb.succeed("curl -f http://localhost:8080/containers/")

     

       32
       32
       +
         '';

     

       33
       33
       +
       }