NotificationsYou must be signed in to change notification settings
Fork1k
Star11.1k

Commit655a36c

authored

test: fix TestAgentConnectionMonitor_PingTimeout race with mock assertions (#19836)

Fixescoder/internal#970The test doesn't wait for `monitor()` to complete, and the mock database call that we assert takes place in a `defer` within `monitor()`. This allows the mock assertions to race with the defer and flake the test.Solution is to explicitly wait for `monitor()` to complete before the end of the test, so that mock assertions (which happen in a `t.Cleanup()`) don't race.

1 parent4fc0093 commit655a36cCopy full SHA for 655a36c

File tree

1 file changed

-1

lines changed

coderd
- workspaceagentsrpc_internal_test.go

1 file changed

-1

lines changed

`‎coderd/workspaceagentsrpc_internal_test.go‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,14 @@ func TestAgentConnectionMonitor_PingTimeout(t *testing.T) {`
`150`	`150`	`AnyTimes().`
`151`	`151`	`Return(database.WorkspaceBuild{ID:build.ID},nil)`
`152`	`152`
`153`		`-gouut.monitor(ctx)`
	`153`	`+done:=make(chanstruct{})`
	`154`	`+gofunc() {`
	`155`	`+uut.monitor(ctx)`
	`156`	`+close(done)`
	`157`	`+}()`
`154`	`158`	`fConn.requireEventuallyClosed(t,websocket.StatusGoingAway,"ping timeout")`
`155`	`159`	`fUpdater.requireEventuallySomeUpdates(t,build.WorkspaceID)`
	`160`	`+_=testutil.TryReceive(ctx,t,done)// ensure monitor() exits before mDB assertions are checked.`
`156`	`161`	`}`
`157`	`162`
`158`	`163`	`funcTestAgentConnectionMonitor_BuildOutdated(t*testing.T) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit655a36c

File tree

1 file changed

1 file changed

`‎coderd/workspaceagentsrpc_internal_test.go‎`

0 commit comments