From 33180313d805212353d0526e3d95d49fe70eed91 Mon Sep 17 00:00:00 2001
From: Igor Drozdov <idrozdov@gitlab.com>
Date: Mon, 15 Nov 2021 18:15:03 +0300
Subject: Refactor flaky test case in sshd_test

- Use require.Regexp to expect ssh handshake error
- Use require.Eventually to refactor verifyStatus
---
 internal/sshd/sshd_test.go | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/internal/sshd/sshd_test.go b/internal/sshd/sshd_test.go
index 455a830..0c6a8ec 100644
--- a/internal/sshd/sshd_test.go
+++ b/internal/sshd/sshd_test.go
@@ -48,8 +48,7 @@ func TestListenAndServe(t *testing.T) {
 }
 
 func TestListenAndServeRejectsPlainConnectionsWhenProxyProtocolEnabled(t *testing.T) {
-	s := setupServerWithProxyProtocolEnabled(t)
-	defer s.Shutdown()
+	setupServerWithProxyProtocolEnabled(t)
 
 	client, err := ssh.Dial("tcp", serverUrl, clientConfig(t))
 	if client != nil {
@@ -57,7 +56,7 @@ func TestListenAndServeRejectsPlainConnectionsWhenProxyProtocolEnabled(t *testin
 	}
 
 	require.Error(t, err, "Expected plain SSH request to be failed")
-	require.Equal(t, err.Error(), "ssh: handshake failed: EOF")
+	require.Regexp(t, "ssh: handshake failed", err.Error())
 }
 
 func TestCorrelationId(t *testing.T) {
@@ -227,14 +226,5 @@ func holdSession(t *testing.T, c *ssh.Client) {
 }
 
 func verifyStatus(t *testing.T, s *Server, st status) {
-	for i := 5; i < 500; i += 50 {
-		if s.getStatus() == st {
-			break
-		}
-
-		// Sleep incrementally ~2s in total
-		time.Sleep(time.Duration(i) * time.Millisecond)
-	}
-
-	require.Equal(t, st, s.getStatus())
+	require.Eventually(t, func() bool { return s.getStatus() == st }, 2*time.Second, time.Millisecond)
 }
-- 
cgit v1.2.1