nixosTests.scaphandre: handleTest -> runTest

2025-07-10 10:40:15 +08:00
parent f693e18323
commit ea3e5b125c
2 changed files with 14 additions and 18 deletions
@@ -1260,7 +1260,7 @@ in
  sane = runTest ./sane.nix;
  sanoid = runTest ./sanoid.nix;
  saunafs = runTest ./saunafs.nix;
-  scaphandre = handleTest ./scaphandre.nix { };
+  scaphandre = runTest ./scaphandre.nix;
  schleuder = runTest ./schleuder.nix;
  scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { };
  scrutiny = runTest ./scrutiny.nix;
@@ -1,22 +1,18 @@
-import ./make-test-python.nix {
+{
  name = "scaphandre";

-  nodes = {
-    scaphandre =
-      { pkgs, ... }:
-      {
-        boot.kernelModules = [ "intel_rapl_common" ];
+  nodes.scaphandre =
+    { pkgs, ... }:
+    {
+      boot.kernelModules = [ "intel_rapl_common" ];

-        environment.systemPackages = [ pkgs.scaphandre ];
-      };
-  };
+      environment.systemPackages = [ pkgs.scaphandre ];
+    };

-  testScript =
-    { nodes, ... }:
-    ''
-      scaphandre.start()
-      scaphandre.wait_until_succeeds(
-          "scaphandre stdout -t 4",
-      )
-    '';
+  testScript = ''
+    scaphandre.start()
+    scaphandre.wait_until_succeeds(
+        "scaphandre stdout -t 4",
+    )
+  '';
 }