commit 110b3af97a8524161cd90e7a2aa5f2c269e4268c · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       341
       341
        
         early-mount-options = handleTest ./early-mount-options.nix {};

     

       342
       342
        
         ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};

     

       343
       343
        
         ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};

     

       344
       344
       -
         echoip = handleTest ./echoip.nix {};

     

       344
       344
       +
         echoip = runTest ./echoip.nix;

     

       345
       345
        
         ecryptfs = handleTest ./ecryptfs.nix {};

     

       346
       346
        
         fscrypt = handleTest ./fscrypt.nix {};

     

       347
       347
        
         fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;

+23 -24

nixos/tests/echoip.nix

···

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

     

       2
       2
       -
         { lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "echoip";

     

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

     

       1
       1
       +
       { lib, ... }:

     

       6
       2
        
       

     

       7
       7
       -
           nodes.machine = {

     

       8
       8
       -
             services.echoip = {

     

       9
       9
       -
               enable = true;

     

       10
       10
       -
               virtualHost = "echoip.local";

     

       11
       11
       -
             };

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "echoip";

     

       5
       5
       +
         meta.maintainers = with lib.maintainers; [ defelo ];

     

       12
       6
        
       

     

       13
       13
       -
             networking.hosts = {

     

       14
       14
       -
               "127.0.0.1" = [ "echoip.local" ];

     

       15
       15
       -
               "::1" = [ "echoip.local" ];

     

       16
       16
       -
             };

     

       7
       7
       +
         nodes.machine = {

     

       8
       8
       +
           services.echoip = {

     

       9
       9
       +
             enable = true;

     

       10
       10
       +
             virtualHost = "echoip.local";

     

       11
       11
       +
           };

     

       12
       12
       +
       

     

       13
       13
       +
           networking.hosts = {

     

       14
       14
       +
             "127.0.0.1" = [ "echoip.local" ];

     

       15
       15
       +
             "::1" = [ "echoip.local" ];

     

       17
       16
        
           };

     

       17
       17
       +
         };

     

       18
       18
        
       

     

       19
       19
       -
           testScript = ''

     

       20
       20
       -
             machine.wait_for_unit("echoip.service")

     

       21
       21
       -
             machine.wait_for_open_port(8080)

     

       19
       19
       +
         testScript = ''

     

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

     

       21
       21
       +
           machine.wait_for_open_port(8080)

     

       22
       22
        
       

     

       23
       23
       -
             resp = machine.succeed("curl -4 http://echoip.local/ip")

     

       24
       24
       -
             assert resp.strip() == "127.0.0.1"

     

       25
       25
       -
             resp = machine.succeed("curl -6 http://echoip.local/ip")

     

       26
       26
       -
             assert resp.strip() == "::1"

     

       27
       27
       -
           '';

     

       28
       28
       -
         }

     

       29
       29
       -
       )

     

       23
       23
       +
           resp = machine.succeed("curl -4 http://echoip.local/ip")

     

       24
       24
       +
           assert resp.strip() == "127.0.0.1"

     

       25
       25
       +
           resp = machine.succeed("curl -6 http://echoip.local/ip")

     

       26
       26
       +
           assert resp.strip() == "::1"

     

       27
       27
       +
         '';

     

       28
       28
       +
       }