summary refs log tree commit diff
path: root/gnu/tests/ssh.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-21 15:47:56 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-21 16:33:21 +0200
commita295a1ca2942794ac52321a639128f94be595ac5 (patch)
treef79bb15c053a5c1a93f278df03bff2eaa1cf4f13 /gnu/tests/ssh.scm
parentd10e7a348ccc5cca147c6454618c2c41e1801db8 (diff)
downloadguix-a295a1ca2942794ac52321a639128f94be595ac5.tar.gz
tests: ssh: Explicitly wait for port 22.
Previously we could occasionally try to connect before the server is
actually listening, both for OpenSSH and Dropbear.

* gnu/tests/ssh.scm (run-ssh-test)["wait for port 22"]: New test.
Diffstat (limited to 'gnu/tests/ssh.scm')
-rw-r--r--gnu/tests/ssh.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/tests/ssh.scm b/gnu/tests/ssh.scm
index a74227ea4a..10438ad22a 100644
--- a/gnu/tests/ssh.scm
+++ b/gnu/tests/ssh.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;;
@@ -136,6 +136,9 @@ root with an empty password."
                          (current-services))))
                marionette))
 
+            (test-assert "wait for port 22"
+              (wait-for-tcp-port 22 marionette))
+
             ;; Connect to the guest over SSH.  Make sure we can run a shell
             ;; command there.
             (test-equal "shell command"