diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
commit | bdd4646338da296fdf3a8f9dc3cf5aff1dafa163 (patch) | |
tree | 8bda49fe3eaef361a025c0f3b64ea51ea7728cbe /tests/nix-copy-closure.nix | |
parent | e73d9e948887621906363a35c980538294898a02 (diff) |
Revert "Prevent config.h from being clobbered"
This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6.
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. |