Commit6b4eb03

authored

chore: give additional time in tests fortailnetAPIConnector graceful disconnect (#12980)

1 parent3338cdc commit6b4eb03Copy full SHA for 6b4eb03

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ import (`
`20`	`20`	`"github.com/coder/retry"`
`21`	`21`	`)`
`22`	`22`
	`23`	`+vartailnetConnectorGracefulTimeout=time.Second`
	`24`	`+`
`23`	`25`	`// tailnetConn is the subset of the tailnet.Conn methods that tailnetAPIConnector uses. It is`
`24`	`26`	`// included so that we can fake it in testing.`
`25`	`27`	`//`
`@@ -86,7 +88,7 @@ func runTailnetAPIConnector(`
`86`	`88`	`func (tac*tailnetAPIConnector)manageGracefulTimeout() {`
`87`	`89`	`defertac.cancelGracefulCtx()`
`88`	`90`	`<-tac.ctx.Done()`
`89`		`-timer:=time.NewTimer(time.Second)`
	`91`	`+timer:=time.NewTimer(tailnetConnectorGracefulTimeout)`
`90`	`92`	`defertimer.Stop()`
`91`	`93`	`select {`
`92`	`94`	`case<-tac.closed:`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ import (`
`24`	`24`	`"github.com/coder/coder/v2/testutil"`
`25`	`25`	`)`
`26`	`26`
	`27`	`+funcinit() {`
	`28`	`+// Give tests a bit more time to timeout. Darwin is particularly slow.`
	`29`	`+tailnetConnectorGracefulTimeout=5*time.Second`
	`30`	`+}`
	`31`	`+`
`27`	`32`	`funcTestTailnetAPIConnector_Disconnects(t*testing.T) {`
`28`	`33`	`t.Parallel()`
`29`	`34`	`testCtx:=testutil.Context(t,testutil.WaitShort)`

Comments

(0)