From 4f57c255accbc637770323f592f137252b3c53fb Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 29 Mar 2025 17:29:12 +0100
Subject: [PATCH] nixosTests.unit-php: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix            |   2 +-
 nixos/tests/web-servers/unit-php.nix | 102 +++++++++++++--------------
 2 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index ede3e3fc3a0e..473cfb4c3062 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1257,7 +1257,7 @@ in {
   umurmur = handleTest ./umurmur.nix {};
   unbound = handleTest ./unbound.nix {};
   unifi = handleTest ./unifi.nix {};
-  unit-php = handleTest ./web-servers/unit-php.nix {};
+  unit-php = runTest ./web-servers/unit-php.nix;
   unit-perl = handleTest ./web-servers/unit-perl.nix {};
   upnp.iptables = handleTest ./upnp.nix { useNftables = false; };
   upnp.nftables = handleTest ./upnp.nix { useNftables = true; };
diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix
index fcf0224639da..ae7503ad0ffa 100644
--- a/nixos/tests/web-servers/unit-php.nix
+++ b/nixos/tests/web-servers/unit-php.nix
@@ -1,62 +1,60 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
-  let
-    testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";
+{ pkgs, ... }:
+let
+  testdir = pkgs.writeTextDir "www/info.php" "<?php phpinfo();";
 
-  in
-  {
-    name = "unit-php-test";
-    meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
+in
+{
+  name = "unit-php-test";
+  meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-    nodes.machine =
-      {
-        config,
-        lib,
-        pkgs,
-        ...
-      }:
-      {
-        services.unit = {
-          enable = true;
-          config = pkgs.lib.strings.toJSON {
-            listeners."*:9081".application = "php_81";
-            applications.php_81 = {
-              type = "php 8.1";
-              processes = 1;
-              user = "testuser";
-              group = "testgroup";
-              root = "${testdir}/www";
-              index = "info.php";
-              options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";
-            };
-          };
-        };
-        users = {
-          users.testuser = {
-            isSystemUser = true;
-            uid = 1080;
+  nodes.machine =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    {
+      services.unit = {
+        enable = true;
+        config = pkgs.lib.strings.toJSON {
+          listeners."*:9081".application = "php_81";
+          applications.php_81 = {
+            type = "php 8.1";
+            processes = 1;
+            user = "testuser";
             group = "testgroup";
-          };
-          groups.testgroup = {
-            gid = 1080;
+            root = "${testdir}/www";
+            index = "info.php";
+            options.file = "${pkgs.unit.usedPhp81}/lib/php.ini";
           };
         };
       };
-    testScript = ''
-      machine.start()
+      users = {
+        users.testuser = {
+          isSystemUser = true;
+          uid = 1080;
+          group = "testgroup";
+        };
+        groups.testgroup = {
+          gid = 1080;
+        };
+      };
+    };
+  testScript = ''
+    machine.start()
 
-      machine.wait_for_unit("unit.service")
-      machine.wait_for_open_port(9081)
+    machine.wait_for_unit("unit.service")
+    machine.wait_for_open_port(9081)
 
-      # Check so we get an evaluated PHP back
-      response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/")
-      assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected"
+    # Check so we get an evaluated PHP back
+    response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/")
+    assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected"
 
-      # Check so we have database and some other extensions loaded
-      for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
-          assert ext in response, f"Missing {ext} extension"
+    # Check so we have database and some other extensions loaded
+    for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
+        assert ext in response, f"Missing {ext} extension"
 
-      machine.shutdown()
-    '';
-  }
-)
+    machine.shutdown()
+  '';
+}