nixosTests.mobilizon: migrate from handleTest to runTest

This commit is contained in:
Niklas Korz 2025-01-16 11:38:53 +01:00
parent 142d7c0f88
commit eb9659fa9b
2 changed files with 41 additions and 43 deletions

View file

@ -615,7 +615,7 @@ in {
misc = handleTest ./misc.nix {}; misc = handleTest ./misc.nix {};
misskey = handleTest ./misskey.nix {}; misskey = handleTest ./misskey.nix {};
mjolnir = handleTest ./matrix/mjolnir.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {};
mobilizon = handleTest ./mobilizon.nix {}; mobilizon = runTest ./mobilizon.nix;
mod_perl = handleTest ./mod_perl.nix {}; mod_perl = handleTest ./mod_perl.nix {};
molly-brown = handleTest ./molly-brown.nix {}; molly-brown = handleTest ./molly-brown.nix {};
mollysocket = handleTest ./mollysocket.nix { }; mollysocket = handleTest ./mollysocket.nix { };

View file

@ -1,49 +1,47 @@
import ./make-test-python.nix ( { lib, ... }:
{ lib, ... }: let
let certs = import ./common/acme/server/snakeoil-certs.nix;
certs = import ./common/acme/server/snakeoil-certs.nix; mobilizonDomain = certs.domain;
mobilizonDomain = certs.domain; port = 41395;
port = 41395; in
in
{ {
name = "mobilizon"; name = "mobilizon";
meta.maintainers = with lib.maintainers; [ meta.maintainers = with lib.maintainers; [
minijackson minijackson
erictapen erictapen
]; ];
nodes.server = nodes.server =
{ ... }: { ... }:
{ {
services.mobilizon = { services.mobilizon = {
enable = true; enable = true;
settings = { settings = {
":mobilizon" = { ":mobilizon" = {
":instance" = { ":instance" = {
name = "Test Mobilizon"; name = "Test Mobilizon";
hostname = mobilizonDomain; hostname = mobilizonDomain;
};
"Mobilizon.Web.Endpoint".http.port = port;
}; };
"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 = '' security.pki.certificateFiles = [ certs.ca.cert ];
server.wait_for_unit("mobilizon.service")
server.wait_for_open_port(${toString port}) services.nginx.virtualHosts."${mobilizonDomain}" = {
server.succeed("curl --fail https://${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}/")
'';
}