From 1c825e3db490e1ed1eb2d921e51f4025173ae05a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 14 Mar 2025 22:43:51 +0100
Subject: [PATCH] nixosTests.zookeeper: migrate to runTest

Part Of #386873
---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/zookeeper.nix | 90 +++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7585bbcc90ee..99e80f0ec537 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1316,7 +1316,7 @@ in {
   };
   zipline = handleTest ./zipline.nix {};
   zoneminder = handleTest ./zoneminder.nix {};
-  zookeeper = handleTest ./zookeeper.nix {};
+  zookeeper = runTest ./zookeeper.nix;
   zram-generator = runTest ./zram-generator.nix;
   zrepl = runTest ./zrepl.nix;
   zsh-history = runTest ./zsh-history.nix;
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
index 8442f021e051..b1fc0d3a8604 100644
--- a/nixos/tests/zookeeper.nix
+++ b/nixos/tests/zookeeper.nix
@@ -1,54 +1,52 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  let
+{ pkgs, ... }:
+let
 
-    perlEnv = pkgs.perl.withPackages (p: [ p.NetZooKeeper ]);
+  perlEnv = pkgs.perl.withPackages (p: [ p.NetZooKeeper ]);
 
-  in
-  {
-    name = "zookeeper";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        nequissimus
-        ztzg
-      ];
-    };
+in
+{
+  name = "zookeeper";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      nequissimus
+      ztzg
+    ];
+  };
 
-    nodes = {
-      server =
-        { ... }:
-        {
-          services.zookeeper = {
-            enable = true;
-          };
-
-          networking.firewall.allowedTCPPorts = [ 2181 ];
+  nodes = {
+    server =
+      { ... }:
+      {
+        services.zookeeper = {
+          enable = true;
         };
-    };
 
-    testScript = ''
-      start_all()
+        networking.firewall.allowedTCPPorts = [ 2181 ];
+      };
+  };
 
-      server.wait_for_unit("zookeeper")
-      server.wait_for_unit("network.target")
-      server.wait_for_open_port(2181)
+  testScript = ''
+    start_all()
 
-      server.wait_until_succeeds(
-          "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar"
-      )
-      server.wait_until_succeeds(
-          "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello"
-      )
-      server.wait_until_succeeds(
-          "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"
-      )
+    server.wait_for_unit("zookeeper")
+    server.wait_for_unit("network.target")
+    server.wait_for_open_port(2181)
 
-      server.wait_until_succeeds(
-          "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->create(qw(/perl foo acl), ZOO_OPEN_ACL_UNSAFE) || die $z->get_error()'"
-      )
-      server.wait_until_succeeds(
-          "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->get(qw(/perl)) eq qw(foo) || die $z->get_error()'"
-      )
-    '';
-  }
-)
+    server.wait_until_succeeds(
+        "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar"
+    )
+    server.wait_until_succeeds(
+        "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello"
+    )
+    server.wait_until_succeeds(
+        "${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"
+    )
+
+    server.wait_until_succeeds(
+        "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->create(qw(/perl foo acl), ZOO_OPEN_ACL_UNSAFE) || die $z->get_error()'"
+    )
+    server.wait_until_succeeds(
+        "${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->get(qw(/perl)) eq qw(foo) || die $z->get_error()'"
+    )
+  '';
+}