tests/client-server.scm (make-session/channel-test): Improve

* tests/client-server.scm (make-session/channel-test): Try to connect several
  times before giving up.  Improve logging.

1 files changed, 24 insertions, 6 deletions

diff --git a/tests/client-server.scm b/tests/client-server.scm
index 1e0fd94..e8e8ea0 100644
--- a/tests/client-server.scm
+++ b/tests/client-server.scm
@@ -382,12 +382,30 @@
 
 (define (make-session/channel-test)
   "Make a session for a channel test."
-  (let ((session (make-session-for-test)))
-    (sleep 1)
-    (connect! session)
-    (authenticate-server session)
-    (userauth-none! session)
-    session))
+  (define max-tries 30)
+  (let loop ((session (make-session-for-test))
+             (count   max-tries))
+    (if (not (eq? (connect! session) 'ok))
+        (begin
+          (format-log/scm 'nolog
+                          "make-session/channel-test"
+                          "Unable to connect in ~d tries: ~a~%"
+                          (- max-tries count)
+                          session)
+          (disconnect! session)
+          (set! session #f)
+          (sleep 1)
+          (if (zero? count)
+              (format-log/scm 'nolog
+                              "make-session/channel-test"
+                              "~a"
+                              "Giving up ...")
+              (loop (make-session-for-test)
+                    (1- count))))
+        (begin
+          (authenticate-server session)
+          (userauth-none! session)
+          session))))
 
 (test-assert "make-channel"
   (run-client-test