git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75795 from kampka/port-tests-4

Port NixOS tests to python

commitf7b6824e5d80c707cda38cb8ed0be91e93b0af34 authorNiklas Hambüchen <mail@nh2.me> dateWed 18 Dec 2019, 02:14 (7 years ago) parent797b70605587ab
3 files changed+31−31
nixos/tests/hadoop/hdfs.nix+13−13 nixos/tests/hadoop/yarn.nix+12−12 nixos/tests/hitch/default.nix+6−6
nixos/tests/hadoop/hdfs.nix+13−13
@@ -1,4 +1,4 @@
1−import ../make-test.nix ({...}: {
1+import ../make-test-python.nix ({...}: {
22 nodes = {
33 namenode = {pkgs, ...}: {
44 services.hadoop = {
@@ -35,20 +35,20 @@ import ../make-test.nix ({...}: {
3535 };
3636
3737 testScript = ''
38− startAll
38+ start_all()
3939
40− $namenode->waitForUnit("hdfs-namenode");
41− $namenode->waitForUnit("network.target");
42− $namenode->waitForOpenPort(8020);
43− $namenode->waitForOpenPort(9870);
40+ namenode.wait_for_unit("hdfs-namenode")
41+ namenode.wait_for_unit("network.target")
42+ namenode.wait_for_open_port(8020)
43+ namenode.wait_for_open_port(9870)
4444
45− $datanode->waitForUnit("hdfs-datanode");
46− $datanode->waitForUnit("network.target");
47− $datanode->waitForOpenPort(9864);
48− $datanode->waitForOpenPort(9866);
49− $datanode->waitForOpenPort(9867);
45+ datanode.wait_for_unit("hdfs-datanode")
46+ datanode.wait_for_unit("network.target")
47+ datanode.wait_for_open_port(9864)
48+ datanode.wait_for_open_port(9866)
49+ datanode.wait_for_open_port(9867)
5050
51− $namenode->succeed("curl http://namenode:9870");
52− $datanode->succeed("curl http://datanode:9864");
51+ namenode.succeed("curl http://namenode:9870")
52+ datanode.succeed("curl http://datanode:9864")
5353 '';
5454})
nixos/tests/hadoop/yarn.nix+12−12
@@ -1,4 +1,4 @@
1−import ../make-test.nix ({...}: {
1+import ../make-test-python.nix ({...}: {
22 nodes = {
33 resourcemanager = {pkgs, ...}: {
44 services.hadoop.package = pkgs.hadoop_3_1;
@@ -28,19 +28,19 @@ import ../make-test.nix ({...}: {
2828 };
2929
3030 testScript = ''
31− startAll;
31+ start_all()
3232
33− $resourcemanager->waitForUnit("yarn-resourcemanager");
34− $resourcemanager->waitForUnit("network.target");
35− $resourcemanager->waitForOpenPort(8031);
36− $resourcemanager->waitForOpenPort(8088);
33+ resourcemanager.wait_for_unit("yarn-resourcemanager")
34+ resourcemanager.wait_for_unit("network.target")
35+ resourcemanager.wait_for_open_port(8031)
36+ resourcemanager.wait_for_open_port(8088)
3737
38− $nodemanager->waitForUnit("yarn-nodemanager");
39− $nodemanager->waitForUnit("network.target");
40− $nodemanager->waitForOpenPort(8042);
41− $nodemanager->waitForOpenPort(8041);
38+ nodemanager.wait_for_unit("yarn-nodemanager")
39+ nodemanager.wait_for_unit("network.target")
40+ nodemanager.wait_for_open_port(8042)
41+ nodemanager.wait_for_open_port(8041)
4242
43− $resourcemanager->succeed("curl http://localhost:8088");
44− $nodemanager->succeed("curl http://localhost:8042");
43+ resourcemanager.succeed("curl http://localhost:8088")
44+ nodemanager.succeed("curl http://localhost:8042")
4545 '';
4646})
nixos/tests/hitch/default.nix+6−6
@@ -1,4 +1,4 @@
1−import ../make-test.nix ({ pkgs, ... }:
1+import ../make-test-python.nix ({ pkgs, ... }:
22{
33 name = "hitch";
44 meta = with pkgs.stdenv.lib.maintainers; {
@@ -23,11 +23,11 @@ import ../make-test.nix ({ pkgs, ... }:
2323
2424 testScript =
2525 ''
26− startAll;
26+ start_all()
2727
28− $machine->waitForUnit('multi-user.target');
29− $machine->waitForUnit('hitch.service');
30− $machine->waitForOpenPort(443);
31− $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"');
28+ machine.wait_for_unit("multi-user.target")
29+ machine.wait_for_unit("hitch.service")
30+ machine.wait_for_open_port(443)
31+ assert "We are all good!" in machine.succeed("curl -k https://localhost:443/index.txt")
3232 '';
3333})