From d8d1e397cb655e4f5f8064d7f5d9fe864528db14 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 14 Mar 2025 22:37:17 +0100
Subject: [PATCH] nixosTests.zwave-js-ui: migrate to runTest

Part Of #386873
---
 nixos/tests/all-tests.nix   |  2 +-
 nixos/tests/zwave-js-ui.nix | 50 ++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 52d7e8fb618f..463baf6c22c0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1321,5 +1321,5 @@ in {
   zrepl = handleTest ./zrepl.nix {};
   zsh-history = handleTest ./zsh-history.nix {};
   zwave-js = handleTest ./zwave-js.nix {};
-  zwave-js-ui = handleTest ./zwave-js-ui.nix {};
+  zwave-js-ui = runTest ./zwave-js-ui.nix;
 }
diff --git a/nixos/tests/zwave-js-ui.nix b/nixos/tests/zwave-js-ui.nix
index ea468cdd1a5d..4f3ba972d9d9 100644
--- a/nixos/tests/zwave-js-ui.nix
+++ b/nixos/tests/zwave-js-ui.nix
@@ -1,31 +1,29 @@
-import ./make-test-python.nix (
-  { lib, ... }:
-  {
-    name = "zwave-js-ui";
-    meta.maintainers = with lib.maintainers; [ cdombroski ];
+{ lib, ... }:
+{
+  name = "zwave-js-ui";
+  meta.maintainers = with lib.maintainers; [ cdombroski ];
 
-    nodes = {
-      machine =
-        { ... }:
-        {
-          services.zwave-js-ui = {
-            enable = true;
-            serialPort = "/dev/null";
-            settings = {
-              HOST = "::";
-              PORT = "9999";
-            };
+  nodes = {
+    machine =
+      { ... }:
+      {
+        services.zwave-js-ui = {
+          enable = true;
+          serialPort = "/dev/null";
+          settings = {
+            HOST = "::";
+            PORT = "9999";
           };
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      machine.wait_for_unit("zwave-js-ui.service")
-      machine.wait_for_open_port(9999)
-      machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js-ui --grep 'Listening on port 9999host :: protocol HTTP'")
-      machine.wait_for_file("/var/lib/zwave-js-ui/users.json")
-    '';
-  }
-)
+    machine.wait_for_unit("zwave-js-ui.service")
+    machine.wait_for_open_port(9999)
+    machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js-ui --grep 'Listening on port 9999host :: protocol HTTP'")
+    machine.wait_for_file("/var/lib/zwave-js-ui/users.json")
+  '';
+}