diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 473cfb4c3062..b903c446a6a0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -725,7 +725,7 @@ in { mollysocket = handleTest ./mollysocket.nix { }; monado = handleTest ./monado.nix {}; monetdb = handleTest ./monetdb.nix {}; - monica = handleTest ./web-apps/monica.nix {}; + monica = runTest ./web-apps/monica.nix; mongodb = runTest ./mongodb.nix; mongodb-ce = runTest ({ config, ... }: { imports = [ ./mongodb.nix ]; diff --git a/nixos/tests/web-apps/monica.nix b/nixos/tests/web-apps/monica.nix index bb770828d5f7..9b1995d393d3 100644 --- a/nixos/tests/web-apps/monica.nix +++ b/nixos/tests/web-apps/monica.nix @@ -1,37 +1,35 @@ -import ../make-test-python.nix ( - { pkgs, ... }: - let - cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500 - mkdir -p $out - cp key.pem cert.pem $out - ''; - in - { - name = "monica"; +{ pkgs, ... }: +let + cert = pkgs.runCommand "selfSignedCerts" { nativeBuildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=localhost' -days 36500 + mkdir -p $out + cp key.pem cert.pem $out + ''; +in +{ + name = "monica"; - nodes = { - machine = - { pkgs, ... }: - { - services.monica = { - enable = true; - hostname = "localhost"; - appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}"; - nginx = { - forceSSL = true; - sslCertificate = "${cert}/cert.pem"; - sslCertificateKey = "${cert}/key.pem"; - }; + nodes = { + machine = + { pkgs, ... }: + { + services.monica = { + enable = true; + hostname = "localhost"; + appKeyFile = "${pkgs.writeText "keyfile" "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}"; + nginx = { + forceSSL = true; + sslCertificate = "${cert}/cert.pem"; + sslCertificateKey = "${cert}/key.pem"; }; }; - }; + }; + }; - testScript = '' - start_all() - machine.wait_for_unit("monica-setup.service") - machine.wait_for_open_port(443) - machine.succeed("curl -k --fail https://localhost", timeout=10) - ''; - } -) + testScript = '' + start_all() + machine.wait_for_unit("monica-setup.service") + machine.wait_for_open_port(443) + machine.succeed("curl -k --fail https://localhost", timeout=10) + ''; +}