From f4d6226cf700711f759bf1f4fd523aca9d13f871 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 16 Apr 2025 13:30:49 +0200
Subject: [PATCH] nixosTests.memcached: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/memcached.nix | 58 +++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 8e83095a7ded..664d08a19e83 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -791,7 +791,7 @@ in
   mediatomb = handleTest ./mediatomb.nix { };
   mediawiki = handleTest ./mediawiki.nix { };
   meilisearch = handleTest ./meilisearch.nix { };
-  memcached = handleTest ./memcached.nix { };
+  memcached = runTest ./memcached.nix;
   merecat = handleTest ./merecat.nix { };
   metabase = handleTest ./metabase.nix { };
   mihomo = handleTest ./mihomo.nix { };
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
index c3f8734e320c..de2d7ab421b6 100644
--- a/nixos/tests/memcached.nix
+++ b/nixos/tests/memcached.nix
@@ -1,32 +1,30 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "memcached";
+{ pkgs, ... }:
+{
+  name = "memcached";
 
-    nodes.machine = {
-      imports = [ ../modules/profiles/minimal.nix ];
-      services.memcached.enable = true;
-    };
+  nodes.machine = {
+    imports = [ ../modules/profiles/minimal.nix ];
+    services.memcached.enable = true;
+  };
 
-    testScript =
-      let
-        testScript =
-          pkgs.writers.writePython3 "test_memcache"
-            {
-              libraries = with pkgs.python3Packages; [ memcached ];
-            }
-            ''
-              import memcache
-              c = memcache.Client(['localhost:11211'])
-              c.set('key', 'value')
-              assert 'value' == c.get('key')
-            '';
-      in
-      ''
-        machine.start()
-        machine.wait_for_unit("memcached.service")
-        machine.wait_for_open_port(11211)
-        machine.succeed("${testScript}")
-      '';
-  }
-)
+  testScript =
+    let
+      testScript =
+        pkgs.writers.writePython3 "test_memcache"
+          {
+            libraries = [ pkgs.python3Packages.python-memcached ];
+          }
+          ''
+            import memcache
+            c = memcache.Client(['localhost:11211'])
+            c.set('key', 'value')
+            assert 'value' == c.get('key')
+          '';
+    in
+    ''
+      machine.start()
+      machine.wait_for_unit("memcached.service")
+      machine.wait_for_open_port(11211)
+      machine.succeed("${testScript}")
+    '';
+}