Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0b86c80

Browse files
authored
fix: Close connections in agent tests (coder#3196)
1 parent f34b500 commit 0b86c80

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

agent/agent_test.go

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,12 @@ func TestAgent(t *testing.T) {
120120
localPort := tcpAddr.Port
121121
done := make(chan struct{})
122122
go func() {
123+
defer close(done)
123124
conn, err := local.Accept()
124-
assert.NoError(t, err)
125+
if !assert.NoError(t, err) {
126+
return
127+
}
125128
_ = conn.Close()
126-
close(done)
127129
}()
128130

129131
err = setupSSHCommand(t, []string{"-L", fmt.Sprintf("%d:127.0.0.1:%d", randomPort, localPort)}, []string{"echo", "test"}).Start()
@@ -399,15 +401,18 @@ func setupSSHCommand(t *testing.T, beforeArgs []string, afterArgs []string) *exe
399401
listener, err := net.Listen("tcp", "127.0.0.1:0")
400402
require.NoError(t, err)
401403
go func() {
404+
defer listener.Close()
402405
for {
403406
conn, err := listener.Accept()
404407
if err != nil {
405408
return
406409
}
407410
ssh, err := agentConn.SSH()
408-
assert.NoError(t, err)
409-
go io.Copy(conn, ssh)
410-
go io.Copy(ssh, conn)
411+
if !assert.NoError(t, err) {
412+
_ = conn.Close()
413+
return
414+
}
415+
go agent.Bicopy(context.Background(), conn, ssh)
411416
}
412417
}()
413418
t.Cleanup(func() {

0 commit comments

Comments
 (0)