Commitf290472

authored

test: wait for completion before asserting in TestAgentConnectionMonitor_BuildOutdated (#19959)

follow on to#19836fixescoder/internal#970Same issue, different (adjacent) test.

1 parent904a308 commitf290472Copy full SHA for f290472

File tree

-3

lines changed

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,14 +215,20 @@ func TestAgentConnectionMonitor_BuildOutdated(t *testing.T) {`
`215`	`215`	`AnyTimes().`
`216`	`216`	`Return(database.WorkspaceBuild{ID:uuid.New()},nil)`
`217`	`217`
`218`		`-gouut.monitor(ctx)`
	`218`	`+done:=make(chanstruct{})`
	`219`	`+gofunc() {`
	`220`	`+uut.monitor(ctx)`
	`221`	`+close(done)`
	`222`	`+}()`
`219`	`223`	`fConn.requireEventuallyClosed(t,websocket.StatusGoingAway,"build is outdated")`
`220`	`224`	`fUpdater.requireEventuallySomeUpdates(t,build.WorkspaceID)`
	`225`	`+_=testutil.TryReceive(ctx,t,done)// ensure monitor() exits before mDB assertions are checked.`
`221`	`226`	`}`
`222`	`227`
`223`	`228`	`funcTestAgentConnectionMonitor_SendPings(t*testing.T) {`
`224`	`229`	`t.Parallel()`
`225`		`-ctx,cancel:=context.WithTimeout(context.Background(),testutil.WaitShort)`
	`230`	`+testCtx:=testutil.Context(t,testutil.WaitShort)`
	`231`	`+ctx,cancel:=context.WithCancel(testCtx)`
`226`	`232`	`t.Cleanup(cancel)`
`227`	`233`	`fConn:=&fakePingerCloser{}`
`228`	`234`	`uut:=&agentConnectionMonitor{`
`@@ -236,7 +242,7 @@ func TestAgentConnectionMonitor_SendPings(t *testing.T) {`
`236`	`242`	`}()`
`237`	`243`	`fConn.requireEventuallyHasPing(t)`
`238`	`244`	`cancel()`
`239`		`-<-done`
	`245`	`+_=testutil.TryReceive(testCtx,t,done)`
`240`	`246`	`lastPing:=uut.lastPing.Load()`
`241`	`247`	`require.NotNil(t,lastPing)`
`242`	`248`	`}`

Comments

(0)