Commitbe62f41

committed

fix: update tests to add fish support

1 parentea7e55f commitbe62f41Copy full SHA for be62f41

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -268,10 +268,10 @@ func (a *agent) run(ctx context.Context) error {`
`268`	`268`
`269`	`269`	`scriptDone:=make(chanerror,1)`
`270`	`270`	`scriptStart:=time.Now()`
`271`		`-gofunc() {`
	`271`	`+err=a.trackConnGoroutine(func() {`
`272`	`272`	`deferclose(scriptDone)`
`273`	`273`	`scriptDone<-a.runStartupScript(ctx,metadata.StartupScript)`
`274`		`-}()`
	`274`	`+})`
`275`	`275`	`gofunc() {`
`276`	`276`	`vartimeout<-chan time.Time`
`277`	`277`	`// If timeout is zero, an older version of the coder`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ func TestAgent_Lifecycle(t *testing.T) {`
`703`	`703`	`t.Parallel()`
`704`	`704`
`705`	`705`	`_,client,_,_:=setupAgent(t, agentsdk.Metadata{`
`706`		`-StartupScript:"sleep10",`
	`706`	`+StartupScript:"sleep5",`
`707`	`707`	`StartupScriptTimeout:time.Nanosecond,`
`708`	`708`	`},0)`
`709`	`709`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ import (`
`24`	`24`	`"github.com/coder/coder/testutil"`
`25`	`25`	`)`
`26`	`26`
	`27`	`+funcinit() {`
	`28`	`+// os.Setenv("NO_COLOR", "1")`
	`29`	`+}`
	`30`	`+`
`27`	`31`	`// To update the golden files:`
`28`	`32`	`// make update-golden-files`
`29`	`33`	`varupdateGoldenFiles=flag.Bool("update",false,"update .golden files")`
`@@ -112,7 +116,7 @@ ExtractCommandPathsLoop:`
`112`	`116`
`113`	`117`	`got:=buf.Bytes()`
`114`	`118`	`// Remove CRLF newlines (Windows).`
`115`		`-got=bytes.ReplaceAll(got, []byte{'\r','\n'}, []byte{'\n'})`
	`119`	`+//got = bytes.ReplaceAll(got, []byte{'\r', '\n'}, []byte{'\n'})`
`116`	`120`
`117`	`121`	// The `coder templates create --help` command prints the path
`118`	`122`	`// to the working directory (--directory flag default value).`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,7 @@ func uploadGPGKeys(ctx context.Context, sshClient *gossh.Client) error {`
`458`	`458`	`//`
`459`	`459`	`// Note: we sleep after killing the agent because it doesn't always die`
`460`	`460`	`// immediately.`
`461`		-agentSocketBytes,err:=runRemoteSSH(sshClient,nil,`
	`461`	+agentSocketBytes,err:=runRemoteSSH(sshClient,nil,`sh -c '
`462`	`462`	`set -eux`
`463`	`463`	`agent_socket=$(gpgconf --list-dir agent-socket)`
`464`	`464`	`echo "$agent_socket"`
`@@ -470,7 +470,7 @@ if [ -S "$agent_socket" ]; then`
`470`	`470`	`fi`
`471`	`471`
`472`	`472`	`test ! -S "$agent_socket"`
`473`		-`)
	`473`	+'`)
`474`	`474`	`agentSocket:=strings.TrimSpace(string(agentSocketBytes))`
`475`	`475`	`iferr!=nil {`
`476`	`476`	`returnxerrors.Errorf("check if agent socket is running (check if %q exists): %w",agentSocket,err)`

Comments

(0)