synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(agent): Fix tests without cmd.Wait() (#7029)

Browse Source
This commit is contained in:
Mathias Fredriksson
2023-04-06 16:45:53 +03:00
committed by GitHub
parent 2da0702009
commit 121c2bcde8
1 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
agent/agent_test.go
View File

@ -480,10 +480,24 @@ func TestAgent_TCPLocalForwarding(t *testing.T) {
} }
}() }()
pty := ptytest.New(t)
cmd := setupSSHCommand(t, []string{"-L", fmt.Sprintf("%d:127.0.0.1:%d", randomPort, remotePort)}, []string{"sleep", "5"}) cmd := setupSSHCommand(t, []string{"-L", fmt.Sprintf("%d:127.0.0.1:%d", randomPort, remotePort)}, []string{"sleep", "5"})
cmd.Stdin = pty.Input()
cmd.Stdout = pty.Output()
cmd.Stderr = pty.Output()
err = cmd.Start() err = cmd.Start()
require.NoError(t, err) require.NoError(t, err)
go func() {
err := cmd.Wait()
select {
case <-done:
default:
assert.NoError(t, err)
}
}()
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
conn, err := net.Dial("tcp", "127.0.0.1:"+strconv.Itoa(randomPort)) conn, err := net.Dial("tcp", "127.0.0.1:"+strconv.Itoa(randomPort))
if err != nil { if err != nil {
@ -547,10 +561,24 @@ func TestAgent_TCPRemoteForwarding(t *testing.T) {
} }
}() }()
pty := ptytest.New(t)
cmd := setupSSHCommand(t, []string{"-R", fmt.Sprintf("127.0.0.1:%d:127.0.0.1:%d", randomPort, localPort)}, []string{"sleep", "5"}) cmd := setupSSHCommand(t, []string{"-R", fmt.Sprintf("127.0.0.1:%d:127.0.0.1:%d", randomPort, localPort)}, []string{"sleep", "5"})
cmd.Stdin = pty.Input()
cmd.Stdout = pty.Output()
cmd.Stderr = pty.Output()
err = cmd.Start() err = cmd.Start()
require.NoError(t, err) require.NoError(t, err)
go func() {
err := cmd.Wait()
select {
case <-done:
default:
assert.NoError(t, err)
}
}()
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", randomPort)) conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%d", randomPort))
if err != nil { if err != nil {
@ -612,10 +640,24 @@ func TestAgent_UnixLocalForwarding(t *testing.T) {
} }
}() }()
pty := ptytest.New(t)
cmd := setupSSHCommand(t, []string{"-L", fmt.Sprintf("%s:%s", localSocketPath, remoteSocketPath)}, []string{"sleep", "5"}) cmd := setupSSHCommand(t, []string{"-L", fmt.Sprintf("%s:%s", localSocketPath, remoteSocketPath)}, []string{"sleep", "5"})
cmd.Stdin = pty.Input()
cmd.Stdout = pty.Output()
cmd.Stderr = pty.Output()
err = cmd.Start() err = cmd.Start()
require.NoError(t, err) require.NoError(t, err)
go func() {
err := cmd.Wait()
select {
case <-done:
default:
assert.NoError(t, err)
}
}()
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
_, err := os.Stat(localSocketPath) _, err := os.Stat(localSocketPath)
return err == nil return err == nil
@ -670,10 +712,24 @@ func TestAgent_UnixRemoteForwarding(t *testing.T) {
} }
}() }()
pty := ptytest.New(t)
cmd := setupSSHCommand(t, []string{"-R", fmt.Sprintf("%s:%s", remoteSocketPath, localSocketPath)}, []string{"sleep", "5"}) cmd := setupSSHCommand(t, []string{"-R", fmt.Sprintf("%s:%s", remoteSocketPath, localSocketPath)}, []string{"sleep", "5"})
cmd.Stdin = pty.Input()
cmd.Stdout = pty.Output()
cmd.Stderr = pty.Output()
err = cmd.Start() err = cmd.Start()
require.NoError(t, err) require.NoError(t, err)
go func() {
err := cmd.Wait()
select {
case <-done:
default:
assert.NoError(t, err)
}
}()
// It's possible that the socket is created but the server is not ready to // It's possible that the socket is created but the server is not ready to
// accept connections yet. We need to retry until we can connect. // accept connections yet. We need to retry until we can connect.
var conn net.Conn var conn net.Conn