Merge branch '657-the-testsessionsmetrics-test-from-connection_test-go-214-is-flaky' into 'main'

Ensure prometheus counter has time to increment

Closes #657

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/795



Merged-by: Igor Drozdov <idrozdov@gitlab.com>
Approved-by: Igor Drozdov <idrozdov@gitlab.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>

internal/sshd/connection_test.go

@@ -210,8 +210,8 @@ func TestSessionsMetrics(t *testing.T) {
 		return errors.New("custom error")
 	})
 
-	require.InDelta(t, initialSessionsTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsTotal), 0.1)
-	require.InDelta(t, initialSessionsErrorTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsErrorsTotal), 0.1)
+	eventuallyInDelta(t, initialSessionsTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsTotal), 0.1)
+	eventuallyInDelta(t, initialSessionsErrorTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsErrorsTotal), 0.1)
 
 	for i, ignoredError := range []struct {
 		desc string
@@ -231,8 +231,14 @@ func TestSessionsMetrics(t *testing.T) {
 				return ignored
 			})
 
-			require.InDelta(t, initialSessionsTotal+2+float64(i), testutil.ToFloat64(metrics.SliSshdSessionsTotal), 0.1)
-			require.InDelta(t, initialSessionsErrorTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsErrorsTotal), 0.1)
+			eventuallyInDelta(t, initialSessionsTotal+2+float64(i), testutil.ToFloat64(metrics.SliSshdSessionsTotal), 0.1)
+			eventuallyInDelta(t, initialSessionsErrorTotal+1, testutil.ToFloat64(metrics.SliSshdSessionsErrorsTotal), 0.1)
 		})
 	}
 }
+
+func eventuallyInDelta(t *testing.T, expected, actual, delta float64) {
+	require.Eventually(t, func() bool {
+		return ((expected - actual) < delta)
+	}, 1*time.Second, time.Millisecond)
+}