From e6dd7d6641038fd6e3fe57057d4bc5bde5bf04ff Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 29 Mar 2025 21:54:28 +0100
Subject: [PATCH] nixosTests.icingaweb2: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix  |   2 +-
 nixos/tests/icingaweb2.nix | 122 ++++++++++++++++++-------------------
 2 files changed, 61 insertions(+), 63 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 473cfb4c3062..e9289bc59439 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -557,7 +557,7 @@ in {
   hub = handleTest ./git/hub.nix {};
   hydra = handleTest ./hydra {};
   i3wm = handleTest ./i3wm.nix {};
-  icingaweb2 = handleTest ./icingaweb2.nix {};
+  icingaweb2 = runTest ./icingaweb2.nix;
   ifm = handleTest ./ifm.nix {};
   iftop = handleTest ./iftop.nix {};
   immich = handleTest ./web-apps/immich.nix {};
diff --git a/nixos/tests/icingaweb2.nix b/nixos/tests/icingaweb2.nix
index 2039fbcb2bcd..08fc4f262c08 100644
--- a/nixos/tests/icingaweb2.nix
+++ b/nixos/tests/icingaweb2.nix
@@ -1,76 +1,74 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "icingaweb2";
-    meta = {
-      maintainers = pkgs.lib.teams.helsinki-systems.members;
-    };
+{ pkgs, ... }:
+{
+  name = "icingaweb2";
+  meta = {
+    maintainers = pkgs.lib.teams.helsinki-systems.members;
+  };
 
-    nodes = {
-      icingaweb2 =
-        { config, pkgs, ... }:
-        {
-          services.icingaweb2 = {
-            enable = true;
+  nodes = {
+    icingaweb2 =
+      { config, pkgs, ... }:
+      {
+        services.icingaweb2 = {
+          enable = true;
 
-            modulePackages = with pkgs.icingaweb2Modules; {
-              particles = theme-particles;
-              spring = theme-spring;
+          modulePackages = with pkgs.icingaweb2Modules; {
+            particles = theme-particles;
+            spring = theme-spring;
+          };
+
+          modules = {
+            doc.enable = true;
+            migrate.enable = true;
+            setup.enable = true;
+            test.enable = true;
+            translation.enable = true;
+          };
+
+          generalConfig = {
+            global = {
+              module_path = "${pkgs.icingaweb2}/modules";
             };
+          };
 
-            modules = {
-              doc.enable = true;
-              migrate.enable = true;
-              setup.enable = true;
-              test.enable = true;
-              translation.enable = true;
+          authentications = {
+            icingaweb = {
+              backend = "external";
             };
+          };
 
-            generalConfig = {
-              global = {
-                module_path = "${pkgs.icingaweb2}/modules";
-              };
+          groupBackends = {
+            icingaweb = {
+              backend = "db";
+              resource = "icingaweb_db";
             };
+          };
 
-            authentications = {
-              icingaweb = {
-                backend = "external";
-              };
+          resources = {
+            # Not used, so no DB server needed
+            icingaweb_db = {
+              type = "db";
+              db = "mysql";
+              host = "localhost";
+              username = "icingaweb2";
+              password = "icingaweb2";
+              dbname = "icingaweb2";
             };
+          };
 
-            groupBackends = {
-              icingaweb = {
-                backend = "db";
-                resource = "icingaweb_db";
-              };
-            };
-
-            resources = {
-              # Not used, so no DB server needed
-              icingaweb_db = {
-                type = "db";
-                db = "mysql";
-                host = "localhost";
-                username = "icingaweb2";
-                password = "icingaweb2";
-                dbname = "icingaweb2";
-              };
-            };
-
-            roles = {
-              Administrators = {
-                users = "*";
-                permissions = "*";
-              };
+          roles = {
+            Administrators = {
+              users = "*";
+              permissions = "*";
             };
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
-      icingaweb2.wait_for_unit("multi-user.target")
-      icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    icingaweb2.wait_for_unit("multi-user.target")
+    icingaweb2.succeed("curl -sSf http://icingaweb2/authentication/login")
+  '';
+}