NotificationsYou must be signed in to change notification settings
Fork923
Star10.1k

Commit1aaaad9

authored

fix: fix listening flake on TestTailnet_ForcesWebSockets (#15555)

Fixes a test flake on TestTailnet_ForcesWebsockets like:``` t.go:106: 2024-11-18 07:44:25.939 [debu] w2: dial tcp addr_port="[fd7a:115c:a1e0:46cc:bd8e:400d:1bc6:f6ac]:35565" t.go:106: 2024-11-18 07:44:25.943 [debu] w1.net.netstack: netstack: could not connect to local server at 127.0.0.1:35565 (or [::1]:35565)%!(EXTRA *net.OpError=dial tcp [::1]:35565: connect: connection refused) conn_test.go:146: Error Trace:/Users/spike/repos/coder/tailnet/conn_test.go:146 Error: Received unexpected error: connect tcp [fd7a:115c:a1e0:46cc:bd8e:400d:1bc6:f6ac]:35565: connection was refused Test: TestTailnet/ForcesWebSockets t.go:106: 2024-11-18 07:44:25.945 [info] w1: closing tailnet Conn t.go:106: 2024-11-18 07:44:25.945 [debu] w1: closing configMaps configLoop t.go:106: 2024-11-18 07:44:25.945 [debu] w1: closing nodeUpdater updateLoop t.go:106: 2024-11-18 07:44:25.945 [debu] w1: closed netstack conn_test.go:135: Error Trace:/Users/spike/repos/coder/tailnet/conn_test.go:135 /Users/spike/go/pkg/mod/golang.org/toolchain@v0.0.1-go1.22.8.darwin-arm64/src/runtime/asm_arm64.s:1222 Error: Received unexpected error: connection closed: github.com/coder/coder/v2/tailnet.init <autogenerated>:1 Test: TestTailnet/ForcesWebSocketspanic: runtime error: invalid memory address or nil pointer dereference[signal SIGSEGV: segmentation violation code=0x2 addr=0x0 pc=0x1039771dc]goroutine 2224 [running]:github.com/coder/coder/v2/tailnet_test.TestTailnet.func3.2()/Users/spike/repos/coder/tailnet/conn_test.go:136 +0x7ccreated by github.com/coder/coder/v2/tailnet_test.TestTailnet.func3 in goroutine 109/Users/spike/repos/coder/tailnet/conn_test.go:133 +0x7dc```Test didn't synchronize listening on the port before dialing it. It also has a nil pointer deference when the test fails, which causes a bunch of unrelated output. Also fixed.

1 parentd63bd21 commit1aaaad9Copy full SHA for 1aaaad9

File tree

1 file changed

-4

lines changed

tailnet
- conn_test.go

1 file changed

-4

lines changed

`‎tailnet/conn_test.go`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -129,23 +129,28 @@ func TestTailnet(t *testing.T) {`
`129`	`129`	`stitch(t,w2,w1)`
`130`	`130`	`stitch(t,w1,w2)`
`131`	`131`	`require.True(t,w2.AwaitReachable(ctx,w1IP))`
`132`		`-conn:=make(chanstruct{},1)`
	`132`	`+done:=make(chanstruct{})`
	`133`	`+listening:=make(chanstruct{})`
`133`	`134`	`gofunc() {`
	`135`	`+deferclose(done)`
`134`	`136`	`listener,err:=w1.Listen("tcp",":35565")`
`135`		`-assert.NoError(t,err)`
	`137`	`+if!assert.NoError(t,err) {`
	`138`	`+return`
	`139`	`+}`
`136`	`140`	`deferlistener.Close()`
	`141`	`+close(listening)`
`137`	`142`	`nc,err:=listener.Accept()`
`138`	`143`	`if!assert.NoError(t,err) {`
`139`	`144`	`return`
`140`	`145`	`}`
`141`	`146`	`_=nc.Close()`
`142`		`-conn<-struct{}{}`
`143`	`147`	`}()`
`144`	`148`
	`149`	`+testutil.RequireRecvCtx(ctx,t,listening)`
`145`	`150`	`nc,err:=w2.DialContextTCP(ctx,netip.AddrPortFrom(w1IP,35565))`
`146`	`151`	`require.NoError(t,err)`
`147`	`152`	`_=nc.Close()`
`148`		`-<-conn`
	`153`	`+testutil.RequireRecvCtx(ctx,t,done)`
`149`	`154`
`150`	`155`	`nodes:=make(chan*tailnet.Node,1)`
`151`	`156`	`w2.SetNodeCallback(func(node*tailnet.Node) {`

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!

Commit1aaaad9

File tree

1 file changed

1 file changed

`‎tailnet/conn_test.go`

0 commit comments