From ea3e5b125ccb0ea511da8becd2cd8843a2e56c5d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 9 Jul 2025 12:15:45 +0800
Subject: [PATCH] nixosTests.scaphandre: handleTest -> runTest

---
 nixos/tests/all-tests.nix  |  2 +-
 nixos/tests/scaphandre.nix | 30 +++++++++++++-----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1b97ca80a798..4223143e9f9a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -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;
diff --git a/nixos/tests/scaphandre.nix b/nixos/tests/scaphandre.nix
index 9ca191ab794b..bf9854b1c919 100644
--- a/nixos/tests/scaphandre.nix
+++ b/nixos/tests/scaphandre.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",
+    )
+  '';
 }