Merge pull request #1318 from buildpacks/fix/ssh-dialer-timeout

Fix: wrong implementation of ssh dialer timeout in tests
buildpacks · Nov 8, 2021 · 26d8c5c · 26d8c5c
2 parents 2ac66b7 + eb18598
commit 26d8c5c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/internal/sshdialer/ssh_dialer_test.go b/internal/sshdialer/ssh_dialer_test.go
@@ -574,12 +574,16 @@ func prepareSSHServer(t *testing.T) (connConfig *ConnectionConfig, cleanUp func(
 	}
 
 	// wait for ssh container to start serving ssh
+	// overall timeout before giving up on connecting
+	timeout := time.After(20 * time.Second)
+	// wait this amount between retries
+	waitTicker := time.Tick(2 * time.Second)
 	for {
 		select {
-		case <-time.After(time.Second * 20):
+		case <-timeout:
 			err = fmt.Errorf("test container failed to start serving ssh")
 			return
-		case <-time.After(time.Second * 2):
+		case <-waitTicker:
 		}
 
 		t.Logf("connecting to ssh: %s:%d", connConfig.hostIPv4, connConfig.portIPv4)