From 28cd6cadd23f987f76f176afda651a4e06dfe0f9 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sun, 30 Mar 2025 03:14:28 +0200
Subject: [PATCH] nixosTests.nifi: migrate to runTestOn

Part of #386873
---
 nixos/tests/all-tests.nix     |  2 +-
 nixos/tests/web-apps/nifi.nix | 54 +++++++++++++++++------------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 98240a9f15e7..b25df8a49f00 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -815,7 +815,7 @@ in {
   nginx-tmpdir = handleTest ./nginx-tmpdir.nix {};
   nginx-unix-socket = handleTest ./nginx-unix-socket.nix {};
   nginx-variants = handleTest ./nginx-variants.nix {};
-  nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {};
+  nifi = runTestOn ["x86_64-linux"] ./web-apps/nifi.nix;
   nitter = handleTest ./nitter.nix {};
   nix-config = handleTest ./nix-config.nix {};
   nix-ld = handleTest ./nix-ld.nix {};
diff --git a/nixos/tests/web-apps/nifi.nix b/nixos/tests/web-apps/nifi.nix
index 06c50151c717..d88aa2a18b9d 100644
--- a/nixos/tests/web-apps/nifi.nix
+++ b/nixos/tests/web-apps/nifi.nix
@@ -1,34 +1,32 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "nifi";
-    meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
+{ pkgs, ... }:
+{
+  name = "nifi";
+  meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
 
-    nodes = {
-      nifi =
-        { pkgs, ... }:
-        {
-          virtualisation = {
-            memorySize = 2048;
-            diskSize = 4096;
-          };
-          services.nifi = {
-            enable = true;
-            enableHTTPS = false;
-          };
+  nodes = {
+    nifi =
+      { pkgs, ... }:
+      {
+        virtualisation = {
+          memorySize = 2048;
+          diskSize = 4096;
         };
-    };
+        services.nifi = {
+          enable = true;
+          enableHTTPS = false;
+        };
+      };
+  };
 
-    testScript = ''
-      nifi.start()
+  testScript = ''
+    nifi.start()
 
-      nifi.wait_for_unit("nifi.service")
-      nifi.wait_for_open_port(8080)
+    nifi.wait_for_unit("nifi.service")
+    nifi.wait_for_open_port(8080)
 
-      # Check if NiFi is running
-      nifi.succeed("curl --fail http://127.0.0.1:8080/nifi/login 2> /dev/null | grep 'NiFi Login'")
+    # Check if NiFi is running
+    nifi.succeed("curl --fail http://127.0.0.1:8080/nifi/login 2> /dev/null | grep 'NiFi Login'")
 
-      nifi.shutdown()
-    '';
-  }
-)
+    nifi.shutdown()
+  '';
+}