fix: update tests to add fish support

kylecarbs · kylecarbs · commit be62f411d5a1 · 2023-02-03T01:05:43.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -268,10 +268,10 @@ func (a *agent) run(ctx context.Context) error {
 
 		scriptDone := make(chan error, 1)
 		scriptStart := time.Now()
-		go func() {
+		err = a.trackConnGoroutine(func() {
 			defer close(scriptDone)
 			scriptDone <- a.runStartupScript(ctx, metadata.StartupScript)
-		}()
+		})
 		go func() {
 			var timeout <-chan time.Time
 			// If timeout is zero, an older version of the coder
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -703,7 +703,7 @@ func TestAgent_Lifecycle(t *testing.T) {
 		t.Parallel()
 
 		_, client, _, _ := setupAgent(t, agentsdk.Metadata{
-			StartupScript:        "sleep 10",
+			StartupScript:        "sleep 5",
 			StartupScriptTimeout: time.Nanosecond,
 		}, 0)
 
diff --git a/cli/root_test.go b/cli/root_test.go
@@ -24,6 +24,10 @@ import (
 	"github.com/coder/coder/testutil"
 )
 
+func init() {
+	// os.Setenv("NO_COLOR", "1")
+}
+
 // To update the golden files:
 // make update-golden-files
 var updateGoldenFiles = flag.Bool("update", false, "update .golden files")
@@ -112,7 +116,7 @@ ExtractCommandPathsLoop:
 
 			got := buf.Bytes()
 			// Remove CRLF newlines (Windows).
-			got = bytes.ReplaceAll(got, []byte{'\r', '\n'}, []byte{'\n'})
+			// got = bytes.ReplaceAll(got, []byte{'\r', '\n'}, []byte{'\n'})
 
 			// The `coder templates create --help` command prints the path
 			// to the working directory (--directory flag default value).
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -458,7 +458,7 @@ func uploadGPGKeys(ctx context.Context, sshClient *gossh.Client) error {
 	//
 	// Note: we sleep after killing the agent because it doesn't always die
 	//       immediately.
-	agentSocketBytes, err := runRemoteSSH(sshClient, nil, `
+	agentSocketBytes, err := runRemoteSSH(sshClient, nil, `sh -c '
 set -eux
 agent_socket=$(gpgconf --list-dir agent-socket)
 echo "$agent_socket"
@@ -470,7 +470,7 @@ if [ -S "$agent_socket" ]; then
 fi
 
 test ! -S "$agent_socket"
-`)
+'`)
 	agentSocket := strings.TrimSpace(string(agentSocketBytes))
 	if err != nil {
 		return xerrors.Errorf("check if agent socket is running (check if %q exists): %w", agentSocket, err)
