Skip to content

Commit 9cacca5

Browse files
author
Igor Drozdov
committed
Merge branch 'sh-fix-flaky-race-test' into 'main'
Fix flaky race test Closes #590 See merge request gitlab-org/gitlab-shell!670
2 parents aaa61b5 + f5ae8fa commit 9cacca5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

internal/sshd/connection_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,10 @@ func TestSessionsMetrics(t *testing.T) {
225225
} {
226226
t.Run(ignoredError.desc, func(t *testing.T) {
227227
conn, chans = setup(1, newChannel)
228+
ignored := ignoredError.err
228229
conn.handleRequests(context.Background(), nil, chans, func(*ssh.ServerConn, ssh.Channel, <-chan *ssh.Request) error {
229230
close(chans)
230-
return ignoredError.err
231+
return ignored
231232
})
232233

233234
require.InDelta(t, initialSessionsTotal+2+float64(i), testutil.ToFloat64(metrics.SliSshdSessionsTotal), 0.1)

0 commit comments

Comments
 (0)