172/376: tests/remote-builds.nix: Time out faster

[Ludovic Courtès]

civodul pushed a commit to tag 1.8
in repository guix.

commit f8df935102325d1b33bbcc7d904dd573bced48d5
Author: Eelco Dolstra <address@hidden>
Date:   Fri Sep 5 11:49:07 2014 +0200

    tests/remote-builds.nix: Time out faster
---
 tests/remote-builds.nix |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index 81b81b8..5e2688d 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -60,6 +60,7 @@ in
           virtualisation.pathsInNixDB = [ config.system.build.extraUtils ];
           nix.package = nix;
           nix.binaryCaches = [ ];
+          programs.ssh.extraConfig = "ConnectTimeout 30";
         };
     };
 
@@ -69,14 +70,14 @@ in
 
       # Create an SSH key on the client.
       my $key = `${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
-      $client->succeed("mkdir -m 700 /root/.ssh");
+      $client->succeed("mkdir -p -m 700 /root/.ssh");
       $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
       $client->succeed("chmod 600 /root/.ssh/id_dsa");
 
       # Install the SSH key on the slaves.
       $client->waitForUnit("network.target");
       foreach my $slave ($slave1, $slave2) {
-          $slave->succeed("mkdir -m 700 /root/.ssh");
+          $slave->succeed("mkdir -p -m 700 /root/.ssh");
           $slave->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
           $slave->waitForUnit("sshd");
           $client->succeed("ssh -o StrictHostKeyChecking=no " . $slave->name() 
. " 'echo hello world'");