Commit04e404e

authored

chore: dial the remote socket continually until connect (#6891)

It's possible that the command starts but the socket isn't readyeven when the file exists.

1 parent5686fc9 commit04e404eCopy full SHA for 04e404e

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -673,13 +673,14 @@ func TestAgent_UnixRemoteForwarding(t *testing.T) {`
`673`	`673`	`err=cmd.Start()`
`674`	`674`	`require.NoError(t,err)`
`675`	`675`
	`676`	`+// It's possible that the socket is created but the server is not ready to`
	`677`	`+// accept connections yet. We need to retry until we can connect.`
	`678`	`+varconn net.Conn`
`676`	`679`	`require.Eventually(t,func()bool {`
`677`		`-_,err:=os.Stat(remoteSocketPath)`
	`680`	`+varerrerror`
	`681`	`+conn,err=net.Dial("unix",remoteSocketPath)`
`678`	`682`	`returnerr==nil`
`679`		`-},testutil.WaitLong,testutil.IntervalFast)`
`680`		`-`
`681`		`-conn,err:=net.Dial("unix",remoteSocketPath)`
`682`		`-require.NoError(t,err)`
	`683`	`+},testutil.WaitShort,testutil.IntervalFast)`
`683`	`684`	`deferconn.Close()`
`684`	`685`	`_,err=conn.Write([]byte("test"))`
`685`	`686`	`require.NoError(t,err)`

Comments

(0)