diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-21T21·36+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-21T21·36+0100 |
commit | 1943b60ad820730a74d1dffcdddac396d0c1cb00 (patch) | |
tree | a537c6d2d48a1d8e01ee40d910849bdae785cc5f /tests/nix-copy-closure.nix | |
parent | 96fbbbde55d6f226fc49299ed753761edfb6ad77 (diff) |
Fix the VM tests
Diffstat (limited to 'tests/nix-copy-closure.nix')
-rw-r--r-- | tests/nix-copy-closure.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix index db6103b9cbf7..ca09dffac28b 100644 --- a/tests/nix-copy-closure.nix +++ b/tests/nix-copy-closure.nix @@ -13,14 +13,14 @@ makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in { virtualisation.pathsInNixDB = [ pkgA ]; environment.nix = nix; }; - + server = { config, pkgs, ... }: { services.openssh.enable = true; virtualisation.writableStore = true; virtualisation.pathsInNixDB = [ pkgB ]; environment.nix = nix; - }; + }; }; testScript = { nodes }: @@ -36,8 +36,8 @@ makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in { # Install the SSH key on the server. $server->succeed("mkdir -m 700 /root/.ssh"); $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys"); - $server->waitForJob("sshd"); - $client->waitForJob("network-interfaces"); + $server->waitForUnit("sshd"); + $client->waitForUnit("network.target"); $client->succeed("ssh -o StrictHostKeyChecking=no " . $server->name() . " 'echo hello world'"); # Copy the closure of package A from the client to the server. |