nixos/tests/echoip: use runTest
This commit is contained in:
		
							parent
							
								
									5b67dad13c
								
							
						
					
					
						commit
						110b3af97a
					
				@ -341,7 +341,7 @@ in {
 | 
			
		||||
  early-mount-options = handleTest ./early-mount-options.nix {};
 | 
			
		||||
  ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {};
 | 
			
		||||
  ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {};
 | 
			
		||||
  echoip = handleTest ./echoip.nix {};
 | 
			
		||||
  echoip = runTest ./echoip.nix;
 | 
			
		||||
  ecryptfs = handleTest ./ecryptfs.nix {};
 | 
			
		||||
  fscrypt = handleTest ./fscrypt.nix {};
 | 
			
		||||
  fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
 | 
			
		||||
 | 
			
		||||
@ -1,29 +1,28 @@
 | 
			
		||||
import ./make-test-python.nix (
 | 
			
		||||
  { lib, ... }:
 | 
			
		||||
  {
 | 
			
		||||
    name = "echoip";
 | 
			
		||||
    meta.maintainers = with lib.maintainers; [ defelo ];
 | 
			
		||||
{ lib, ... }:
 | 
			
		||||
 | 
			
		||||
    nodes.machine = {
 | 
			
		||||
      services.echoip = {
 | 
			
		||||
        enable = true;
 | 
			
		||||
        virtualHost = "echoip.local";
 | 
			
		||||
      };
 | 
			
		||||
{
 | 
			
		||||
  name = "echoip";
 | 
			
		||||
  meta.maintainers = with lib.maintainers; [ defelo ];
 | 
			
		||||
 | 
			
		||||
      networking.hosts = {
 | 
			
		||||
        "127.0.0.1" = [ "echoip.local" ];
 | 
			
		||||
        "::1" = [ "echoip.local" ];
 | 
			
		||||
      };
 | 
			
		||||
  nodes.machine = {
 | 
			
		||||
    services.echoip = {
 | 
			
		||||
      enable = true;
 | 
			
		||||
      virtualHost = "echoip.local";
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    testScript = ''
 | 
			
		||||
      machine.wait_for_unit("echoip.service")
 | 
			
		||||
      machine.wait_for_open_port(8080)
 | 
			
		||||
    networking.hosts = {
 | 
			
		||||
      "127.0.0.1" = [ "echoip.local" ];
 | 
			
		||||
      "::1" = [ "echoip.local" ];
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
      resp = machine.succeed("curl -4 http://echoip.local/ip")
 | 
			
		||||
      assert resp.strip() == "127.0.0.1"
 | 
			
		||||
      resp = machine.succeed("curl -6 http://echoip.local/ip")
 | 
			
		||||
      assert resp.strip() == "::1"
 | 
			
		||||
    '';
 | 
			
		||||
  }
 | 
			
		||||
)
 | 
			
		||||
  testScript = ''
 | 
			
		||||
    machine.wait_for_unit("echoip.service")
 | 
			
		||||
    machine.wait_for_open_port(8080)
 | 
			
		||||
 | 
			
		||||
    resp = machine.succeed("curl -4 http://echoip.local/ip")
 | 
			
		||||
    assert resp.strip() == "127.0.0.1"
 | 
			
		||||
    resp = machine.succeed("curl -6 http://echoip.local/ip")
 | 
			
		||||
    assert resp.strip() == "::1"
 | 
			
		||||
  '';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user