diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2019-11-24 01:37:18 +0100 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2019-11-24 02:00:50 +0100 |
| commit | 3a38343576c1f6a13944f97a5c8c4b37b6dd00f6 (patch) | |
| tree | 83fa9b4b7a44638e1c25f96f7714d15c81cedadd | |
| parent | 7e952c3321bec026a10e3bf0e04b7e3c82ac126d (diff) | |
| download | nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar.gz nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar.bz2 nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar.lz nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar.xz nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.tar.zst nixpkgs-3a38343576c1f6a13944f97a5c8c4b37b6dd00f6.zip | |
nixosTests.glusterfs: port to python
Also fix a hardcoded sleep.
| -rw-r--r-- | nixos/tests/glusterfs.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 9fd8bd2ed12..8f9cb8973d5 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ ... } : +import ./make-test-python.nix ({pkgs, lib, ...}: let client = { pkgs, ... } : { @@ -39,27 +39,29 @@ in { }; testScript = '' - $server1->waitForUnit("glusterd.service"); - $server2->waitForUnit("glusterd.service"); + server1.wait_for_unit("glusterd.service") + server2.wait_for_unit("glusterd.service") + + server1.wait_until_succeeds("gluster peer status") + server2.wait_until_succeeds("gluster peer status") # establish initial contact - $server1->succeed("sleep 2"); - $server1->succeed("gluster peer probe server2"); - $server1->succeed("gluster peer probe server1"); + server1.succeed("gluster peer probe server2") + server1.succeed("gluster peer probe server1") - $server1->succeed("gluster peer status | grep Connected"); + server1.succeed("gluster peer status | grep Connected") # create volumes - $server1->succeed("mkdir -p /data/vg0"); - $server2->succeed("mkdir -p /data/vg0"); - $server1->succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0"); - $server1->succeed("gluster volume start gv0"); + server1.succeed("mkdir -p /data/vg0") + server2.succeed("mkdir -p /data/vg0") + server1.succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0") + server1.succeed("gluster volume start gv0") # test clients - $client1->waitForUnit("gluster.mount"); - $client2->waitForUnit("gluster.mount"); + client1.wait_for_unit("gluster.mount") + client2.wait_for_unit("gluster.mount") - $client1->succeed("echo test > /gluster/file1"); - $client2->succeed("grep test /gluster/file1"); + client1.succeed("echo test > /gluster/file1") + client2.succeed("grep test /gluster/file1") ''; }) |