From efee1fc5cc3b411df8741006f7dc142828690d2f Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 16 Apr 2025 14:36:52 +0200
Subject: [PATCH] nixosTests.static-web-server: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix                     |  2 +-
 nixos/tests/web-servers/static-web-server.nix | 70 +++++++++----------
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8e83095a7ded..e290d323c875 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1233,7 +1233,7 @@ in
   stargazer = runTest ./web-servers/stargazer.nix;
   starship = runTest ./starship.nix;
   stash = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stash.nix { };
-  static-web-server = handleTest ./web-servers/static-web-server.nix { };
+  static-web-server = runTest ./web-servers/static-web-server.nix;
   step-ca = handleTestOn [ "x86_64-linux" ] ./step-ca.nix { };
   stratis = handleTest ./stratis { };
   strongswan-swanctl = handleTest ./strongswan-swanctl.nix { };
diff --git a/nixos/tests/web-servers/static-web-server.nix b/nixos/tests/web-servers/static-web-server.nix
index 1c88e70a0957..0727b5cba021 100644
--- a/nixos/tests/web-servers/static-web-server.nix
+++ b/nixos/tests/web-servers/static-web-server.nix
@@ -1,41 +1,39 @@
-import ../make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "static-web-server";
-    meta = {
-      maintainers = with lib.maintainers; [ mac-chaffee ];
-    };
+{ pkgs, lib, ... }:
+{
+  name = "static-web-server";
+  meta = {
+    maintainers = with lib.maintainers; [ mac-chaffee ];
+  };
 
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.static-web-server = {
-          enable = true;
-          listen = "[::]:8080";
-          root = toString (
-            pkgs.writeTextDir "nixos-test.html" ''
-              <h1>Hello NixOS!</h1>
-            ''
-          );
-          configuration = {
-            general = {
-              directory-listing = true;
-            };
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.static-web-server = {
+        enable = true;
+        listen = "[::]:8080";
+        root = toString (
+          pkgs.writeTextDir "nixos-test.html" ''
+            <h1>Hello NixOS!</h1>
+          ''
+        );
+        configuration = {
+          general = {
+            directory-listing = true;
           };
         };
       };
+    };
 
-    testScript = ''
-      machine.start()
-      machine.wait_for_unit("static-web-server.socket")
-      machine.wait_for_open_port(8080)
-      # We don't use wait_until_succeeds() because we're testing socket
-      # activation which better work on the first request
-      response = machine.succeed("curl -fsS localhost:8080")
-      assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file"
-      response = machine.succeed("curl -fsS localhost:8080/nixos-test.html")
-      assert "Hello NixOS!" in response
-      machine.wait_for_unit("static-web-server.service")
-    '';
-  }
-)
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("static-web-server.socket")
+    machine.wait_for_open_port(8080)
+    # We don't use wait_until_succeeds() because we're testing socket
+    # activation which better work on the first request
+    response = machine.succeed("curl -fsS localhost:8080")
+    assert "nixos-test.html" in response, "The directory listing page did not include a link to our nixos-test.html file"
+    response = machine.succeed("curl -fsS localhost:8080/nixos-test.html")
+    assert "Hello NixOS!" in response
+    machine.wait_for_unit("static-web-server.service")
+  '';
+}