nixosTests.zookeeper: migrate to runTest

Part Of #386873

Changed files
+45 -47
nixos
+1 -1
nixos/tests/all-tests.nix
···
};
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;
+44 -46
nixos/tests/zookeeper.nix
···
-
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(
+
"${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()'"
-
)
-
'';
-
}
-
)
+
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()'"
+
)
+
'';
+
}