Commitdda9c56

authored

fix: fix TestTailnet/Connect to wait for listener before dialing (#14148)

1 parente035112 commitdda9c56Copy full SHA for dda9c56

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,13 @@ func TestTailnet(t *testing.T) {`
`64`	`64`	`stitch(t,w1,w2)`
`65`	`65`	`require.True(t,w2.AwaitReachable(context.Background(),w1IP))`
`66`	`66`	`conn:=make(chanstruct{},1)`
	`67`	`+listenDone:=make(chanstruct{})`
`67`	`68`	`gofunc() {`
`68`	`69`	`listener,err:=w1.Listen("tcp",":35565")`
`69`		`-assert.NoError(t,err)`
	`70`	`+if!assert.NoError(t,err) {`
	`71`	`+return`
	`72`	`+}`
	`73`	`+close(listenDone)`
`70`	`74`	`deferlistener.Close()`
`71`	`75`	`nc,err:=listener.Accept()`
`72`	`76`	`if!assert.NoError(t,err) {`
`@@ -76,6 +80,7 @@ func TestTailnet(t *testing.T) {`
`76`	`80`	`conn<-struct{}{}`
`77`	`81`	`}()`
`78`	`82`
	`83`	`+_=testutil.RequireRecvCtx(ctx,t,listenDone)`
`79`	`84`	`nc,err:=w2.DialContextTCP(context.Background(),netip.AddrPortFrom(w1IP,35565))`
`80`	`85`	`require.NoError(t,err)`
`81`	`86`	`_=nc.Close()`

Comments

(0)