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

Part Of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/zwave-js.nix  | 62 ++++++++++++++++++---------------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 463baf6c22c0..50e2bd0c70b4 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1320,6 +1320,6 @@ in {
   zram-generator = handleTest ./zram-generator.nix {};
   zrepl = handleTest ./zrepl.nix {};
   zsh-history = handleTest ./zsh-history.nix {};
-  zwave-js = handleTest ./zwave-js.nix {};
+  zwave-js = runTest ./zwave-js.nix;
   zwave-js-ui = runTest ./zwave-js-ui.nix;
 }
diff --git a/nixos/tests/zwave-js.nix b/nixos/tests/zwave-js.nix
index 3ce12780893e..2815508211f8 100644
--- a/nixos/tests/zwave-js.nix
+++ b/nixos/tests/zwave-js.nix
@@ -1,38 +1,34 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ pkgs, lib, ... }:
 
-  let
-    secretsConfigFile = pkgs.writeText "secrets.json" (
-      builtins.toJSON {
-        securityKeys = {
-          "S0_Legacy" = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
-        };
-      }
-    );
-  in
-  {
-    name = "zwave-js";
-    meta.maintainers = with lib.maintainers; [ graham33 ];
+let
+  secretsConfigFile = pkgs.writeText "secrets.json" (
+    builtins.toJSON {
+      securityKeys = {
+        "S0_Legacy" = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
+      };
+    }
+  );
+in
+{
+  name = "zwave-js";
+  meta.maintainers = with lib.maintainers; [ graham33 ];
 
-    nodes = {
-      machine =
-        { config, ... }:
-        {
-          services.zwave-js = {
-            enable = true;
-            serialPort = "/dev/null";
-            extraFlags = [ "--mock-driver" ];
-            inherit secretsConfigFile;
-          };
-        };
+  nodes = {
+    machine = {
+      services.zwave-js = {
+        enable = true;
+        serialPort = "/dev/null";
+        extraFlags = [ "--mock-driver" ];
+        inherit secretsConfigFile;
+      };
     };
+  };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      machine.wait_for_unit("zwave-js.service")
-      machine.wait_for_open_port(3000)
-      machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'")
-    '';
-  }
-)
+    machine.wait_for_unit("zwave-js.service")
+    machine.wait_for_open_port(3000)
+    machine.wait_until_succeeds("journalctl --since -1m --unit zwave-js --grep 'ZwaveJS server listening'")
+  '';
+}