From 503a6ed79d37f625343cd1ee4d4b0fce3493ca53 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 7 Jun 2025 22:00:52 +0800
Subject: [PATCH] nixosTests.gemstash: handleTest -> runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/gemstash.nix  | 48 +++++++++++++--------------------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index df73a3b2a930..bc9d058e78c7 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -580,7 +580,7 @@ in
   };
   gatus = runTest ./gatus.nix;
   getaddrinfo = runTest ./getaddrinfo.nix;
-  gemstash = handleTest ./gemstash.nix { };
+  gemstash = import ./gemstash.nix { inherit pkgs runTest; };
   geoclue2 = runTest ./geoclue2.nix;
   geoserver = runTest ./geoserver.nix;
   gerrit = runTest ./gerrit.nix;
diff --git a/nixos/tests/gemstash.nix b/nixos/tests/gemstash.nix
index 1b87228e9e63..a654e895debe 100644
--- a/nixos/tests/gemstash.nix
+++ b/nixos/tests/gemstash.nix
@@ -1,29 +1,15 @@
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-
-with import ../lib/testing-python.nix { inherit system pkgs; };
-with pkgs.lib;
-
+{ runTest, pkgs }:
 let
-  common_meta = {
-    maintainers = [ maintainers.viraptor ];
-  };
+  inherit (pkgs) lib;
 in
 {
-  gemstash_works = makeTest {
+  gemstash_works = runTest {
     name = "gemstash-works";
-    meta = common_meta;
+    meta.maintainers = with lib.maintainers; [ viraptor ];
 
-    nodes.machine =
-      { config, pkgs, ... }:
-      {
-        services.gemstash = {
-          enable = true;
-        };
-      };
+    nodes.machine = {
+      services.gemstash.enable = true;
+    };
 
     # gemstash responds to http requests
     testScript = ''
@@ -34,21 +20,19 @@ in
     '';
   };
 
-  gemstash_custom_port = makeTest {
+  gemstash_custom_port = runTest {
     name = "gemstash-custom-port";
-    meta = common_meta;
+    meta.maintainers = with lib.maintainers; [ viraptor ];
 
-    nodes.machine =
-      { config, pkgs, ... }:
-      {
-        services.gemstash = {
-          enable = true;
-          openFirewall = true;
-          settings = {
-            bind = "tcp://0.0.0.0:12345";
-          };
+    nodes.machine = {
+      services.gemstash = {
+        enable = true;
+        openFirewall = true;
+        settings = {
+          bind = "tcp://0.0.0.0:12345";
         };
       };
+    };
 
     # gemstash responds to http requests
     testScript = ''