From eb9659fa9b63f7eee1666ac2cf78884eb53fecf0 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 16 Jan 2025 11:38:53 +0100
Subject: [PATCH] nixosTests.mobilizon: migrate from handleTest to runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/mobilizon.nix | 82 +++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index dd117cca93b8..3cfd2cd4526b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -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 { };
diff --git a/nixos/tests/mobilizon.nix b/nixos/tests/mobilizon.nix
index c456242e1b31..1a07c5fc2732 100644
--- a/nixos/tests/mobilizon.nix
+++ b/nixos/tests/mobilizon.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}/")
+  '';
+}