Fix config ssh tests

kylecarbs · kylecarbs · commit 5d0e63b1fbcb · 2022-04-11T21:10:54.000Z
diff --git a/cli/configssh_test.go b/cli/configssh_test.go
@@ -6,7 +6,6 @@ import (
 	"net"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
 	"testing"
 
@@ -27,6 +26,11 @@ import (
 
 func TestConfigSSH(t *testing.T) {
 	t.Parallel()
+	_, err := exec.LookPath("socat")
+	if err != nil {
+		t.Skip("You must have socat installed to run this test!")
+	}
+
 	client := coderdtest.New(t, nil)
 	user := coderdtest.CreateFirstUser(t, client)
 	coderdtest.NewProvisionerDaemon(t, client)
@@ -85,13 +89,15 @@ func TestConfigSSH(t *testing.T) {
 	require.NoError(t, err)
 	defer agentConn.Close()
 
-	// Using socat we can force SSH to use a UNIX socket
+	// Using socat we can force SSH to use a TCP port
 	// created in this test. That way we still validate
 	// our configuration, but use the native SSH command
 	// line to interface.
-	socket := filepath.Join(t.TempDir(), "ssh")
-	listener, err := net.Listen("unix", socket)
+	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = listener.Close()
+	})
 	go func() {
 		for {
 			conn, err := listener.Accept()
@@ -108,7 +114,7 @@ func TestConfigSSH(t *testing.T) {
 		_ = listener.Close()
 	})
 
-	cmd, root := clitest.New(t, "config-ssh", "--ssh-option", "ProxyCommand socat - UNIX-CLIENT:"+socket, "--ssh-config-file", tempFile.Name())
+	cmd, root := clitest.New(t, "config-ssh", "--ssh-option", "ProxyCommand socat - TCP4:"+listener.Addr().String(), "--ssh-config-file", tempFile.Name())
 	clitest.SetupConfig(t, client, root)
 	doneChan := make(chan struct{})
 	pty := ptytest.New(t)
