From 6f7caa580d3e00b87e661b40fdbba407c70f1f35 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <xokdvium@proton.me>
Date: Tue, 11 Mar 2025 11:21:56 +0000
Subject: [PATCH] rathole: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/rathole.nix   | 90 +++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 55c0cbd8ce1a..1eda3377c0ae 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1005,7 +1005,7 @@ in {
   radicle = runTest ./radicle.nix;
   ragnarwm = handleTest ./ragnarwm.nix {};
   rasdaemon = handleTest ./rasdaemon.nix {};
-  rathole = handleTest ./rathole.nix {};
+  rathole = runTest ./rathole.nix;
   readarr = handleTest ./readarr.nix {};
   realm = handleTest ./realm.nix {};
   readeck = runTest ./readeck.nix;
diff --git a/nixos/tests/rathole.nix b/nixos/tests/rathole.nix
index 56d7a0129f80..a6c11af62888 100644
--- a/nixos/tests/rathole.nix
+++ b/nixos/tests/rathole.nix
@@ -1,43 +1,44 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ lib, ... }:
 
-  let
-    successMessage = "Success 3333115147933743662";
-  in
-  {
-    name = "rathole";
-    meta.maintainers = with lib.maintainers; [ xokdvium ];
-    nodes = {
-      server = {
-        networking = {
-          useNetworkd = true;
-          useDHCP = false;
-          firewall.enable = false;
-        };
+let
+  successMessage = "Success 3333115147933743662";
+in
+{
+  name = "rathole";
+  meta.maintainers = with lib.maintainers; [ xokdvium ];
+  nodes = {
+    server = {
+      networking = {
+        useNetworkd = true;
+        useDHCP = false;
+        firewall.enable = false;
+      };
 
-        systemd.network.networks."01-eth1" = {
-          name = "eth1";
-          networkConfig.Address = "10.0.0.1/24";
-        };
+      systemd.network.networks."01-eth1" = {
+        name = "eth1";
+        networkConfig.Address = "10.0.0.1/24";
+      };
 
-        services.rathole = {
-          enable = true;
-          role = "server";
-          settings = {
-            server = {
-              bind_addr = "0.0.0.0:2333";
-              services = {
-                success-message = {
-                  bind_addr = "0.0.0.0:80";
-                  token = "hunter2";
-                };
+      services.rathole = {
+        enable = true;
+        role = "server";
+        settings = {
+          server = {
+            bind_addr = "0.0.0.0:2333";
+            services = {
+              success-message = {
+                bind_addr = "0.0.0.0:80";
+                token = "hunter2";
               };
             };
           };
         };
       };
+    };
 
-      client = {
+    client =
+      { pkgs, ... }:
+      {
         networking = {
           useNetworkd = true;
           useDHCP = false;
@@ -72,18 +73,17 @@ import ./make-test-python.nix (
           };
         };
       };
-    };
+  };
 
-    testScript = ''
-      start_all()
-      server.wait_for_unit("rathole.service")
-      server.wait_for_open_port(2333)
-      client.wait_for_unit("rathole.service")
-      server.wait_for_open_port(80)
-      response = server.succeed("curl http://127.0.0.1/success-message.txt")
-      assert "${successMessage}" in response, "Got invalid response"
-      response = client.succeed("curl http://10.0.0.1/success-message.txt")
-      assert "${successMessage}" in response, "Got invalid response"
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    server.wait_for_unit("rathole.service")
+    server.wait_for_open_port(2333)
+    client.wait_for_unit("rathole.service")
+    server.wait_for_open_port(80)
+    response = server.succeed("curl http://127.0.0.1/success-message.txt")
+    assert "${successMessage}" in response, "Got invalid response"
+    response = client.succeed("curl http://10.0.0.1/success-message.txt")
+    assert "${successMessage}" in response, "Got invalid response"
+  '';
+}