nixosTests.mobilizon: migrate from handleTest to runTest
This commit is contained in:
		
							parent
							
								
									142d7c0f88
								
							
						
					
					
						commit
						eb9659fa9b
					
				@ -615,7 +615,7 @@ in {
 | 
			
		||||
  misc = handleTest ./misc.nix {};
 | 
			
		||||
  misskey = handleTest ./misskey.nix {};
 | 
			
		||||
  mjolnir = handleTest ./matrix/mjolnir.nix {};
 | 
			
		||||
  mobilizon = handleTest ./mobilizon.nix {};
 | 
			
		||||
  mobilizon = runTest ./mobilizon.nix;
 | 
			
		||||
  mod_perl = handleTest ./mod_perl.nix {};
 | 
			
		||||
  molly-brown = handleTest ./molly-brown.nix {};
 | 
			
		||||
  mollysocket = handleTest ./mollysocket.nix { };
 | 
			
		||||
 | 
			
		||||
@ -1,49 +1,47 @@
 | 
			
		||||
import ./make-test-python.nix (
 | 
			
		||||
  { lib, ... }:
 | 
			
		||||
  let
 | 
			
		||||
    certs = import ./common/acme/server/snakeoil-certs.nix;
 | 
			
		||||
    mobilizonDomain = certs.domain;
 | 
			
		||||
    port = 41395;
 | 
			
		||||
  in
 | 
			
		||||
{ lib, ... }:
 | 
			
		||||
let
 | 
			
		||||
  certs = import ./common/acme/server/snakeoil-certs.nix;
 | 
			
		||||
  mobilizonDomain = certs.domain;
 | 
			
		||||
  port = 41395;
 | 
			
		||||
in
 | 
			
		||||
 | 
			
		||||
  {
 | 
			
		||||
    name = "mobilizon";
 | 
			
		||||
    meta.maintainers = with lib.maintainers; [
 | 
			
		||||
      minijackson
 | 
			
		||||
      erictapen
 | 
			
		||||
    ];
 | 
			
		||||
{
 | 
			
		||||
  name = "mobilizon";
 | 
			
		||||
  meta.maintainers = with lib.maintainers; [
 | 
			
		||||
    minijackson
 | 
			
		||||
    erictapen
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
    nodes.server =
 | 
			
		||||
      { ... }:
 | 
			
		||||
      {
 | 
			
		||||
        services.mobilizon = {
 | 
			
		||||
          enable = true;
 | 
			
		||||
          settings = {
 | 
			
		||||
            ":mobilizon" = {
 | 
			
		||||
              ":instance" = {
 | 
			
		||||
                name = "Test Mobilizon";
 | 
			
		||||
                hostname = mobilizonDomain;
 | 
			
		||||
              };
 | 
			
		||||
              "Mobilizon.Web.Endpoint".http.port = port;
 | 
			
		||||
  nodes.server =
 | 
			
		||||
    { ... }:
 | 
			
		||||
    {
 | 
			
		||||
      services.mobilizon = {
 | 
			
		||||
        enable = true;
 | 
			
		||||
        settings = {
 | 
			
		||||
          ":mobilizon" = {
 | 
			
		||||
            ":instance" = {
 | 
			
		||||
              name = "Test Mobilizon";
 | 
			
		||||
              hostname = mobilizonDomain;
 | 
			
		||||
            };
 | 
			
		||||
            "Mobilizon.Web.Endpoint".http.port = port;
 | 
			
		||||
          };
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        security.pki.certificateFiles = [ certs.ca.cert ];
 | 
			
		||||
 | 
			
		||||
        services.nginx.virtualHosts."${mobilizonDomain}" = {
 | 
			
		||||
          enableACME = lib.mkForce false;
 | 
			
		||||
          sslCertificate = certs.${mobilizonDomain}.cert;
 | 
			
		||||
          sslCertificateKey = certs.${mobilizonDomain}.key;
 | 
			
		||||
        };
 | 
			
		||||
 | 
			
		||||
        networking.hosts."::1" = [ mobilizonDomain ];
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
    testScript = ''
 | 
			
		||||
      server.wait_for_unit("mobilizon.service")
 | 
			
		||||
      server.wait_for_open_port(${toString port})
 | 
			
		||||
      server.succeed("curl --fail https://${mobilizonDomain}/")
 | 
			
		||||
    '';
 | 
			
		||||
  }
 | 
			
		||||
)
 | 
			
		||||
      security.pki.certificateFiles = [ certs.ca.cert ];
 | 
			
		||||
 | 
			
		||||
      services.nginx.virtualHosts."${mobilizonDomain}" = {
 | 
			
		||||
        enableACME = lib.mkForce false;
 | 
			
		||||
        sslCertificate = certs.${mobilizonDomain}.cert;
 | 
			
		||||
        sslCertificateKey = certs.${mobilizonDomain}.key;
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      networking.hosts."::1" = [ mobilizonDomain ];
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
  testScript = ''
 | 
			
		||||
    server.wait_for_unit("mobilizon.service")
 | 
			
		||||
    server.wait_for_open_port(${toString port})
 | 
			
		||||
    server.succeed("curl --fail https://${mobilizonDomain}/")
 | 
			
		||||
  '';
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user