Fix gpg key test

coder · kylecarbs · Jan 29, 2023 · Jan 29, 2023 · Jan 29, 2023 · Jan 29, 2023
commit 09ac2ba0f094b4abd5b9e46008a83a91818a367c
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -433,9 +433,10 @@ func runRemoteSSH(sshClient *gossh.Client, stdin io.Reader, cmd string) ([]byte,
 
 	stderr := bytes.NewBuffer(nil)
 	sess.Stdin = stdin
-	sess.Stderr = stderr
-
-	out, err := sess.Output(cmd)
+	// On fish, this was outputting to stderr instead of stdout.
+	// The tests pass differently on different Linux machines,
+	// so it's best we capture the output of both.
+	out, err := sess.CombinedOutput(cmd)
 	if err != nil {
 		return out, xerrors.Errorf(
 			"`%s` failed: stderr: %s\n\nstdout: %s:\n\n%w",
@@ -470,6 +471,8 @@ fi
 
 test ! -S "$agent_socket"
 `)
+	fmt.Printf("Agent bytes %s\n", agentSocketBytes)
+
 	agentSocket := strings.TrimSpace(string(agentSocketBytes))
 	if err != nil {
 		return xerrors.Errorf("check if agent socket is running (check if %q exists): %w", agentSocket, err)

diff --git a/cli/testdata/coder_templates_create_--help.golden b/cli/testdata/coder_templates_create_--help.golden
@@ -7,7 +7,8 @@ Flags:
       --default-ttl duration          Specify a default TTL for workspaces created from this
                                       template. (default 24h0m0s)
   -d, --directory string              Specify the directory to create from, use '-' to read
-                                      tar from stdin (default "/tmp/coder-cli-test-workdir")
+                                      tar from stdin (default
+                                      "/tmp/coder-cli-test-workdir")
   -h, --help                          help for create
       --parameter-file string         Specify a file path with parameter values.
       --provisioner-tag stringArray   Specify a set of tags to target provisioner daemons.

diff --git a/cli/testdata/coder_templates_push_--help.golden b/cli/testdata/coder_templates_push_--help.golden
@@ -7,7 +7,8 @@ Flags:
       --always-prompt                 Always prompt all parameters. Does not pull parameter
                                       values from active template version
   -d, --directory string              Specify the directory to create from, use '-' to read
-                                      tar from stdin (default "/tmp/coder-cli-test-workdir")
+                                      tar from stdin (default
+                                      "/tmp/coder-cli-test-workdir")
   -h, --help                          help for push
       --name string                   Specify a name for the new template version. It will be
                                       automatically generated if not provided.