SSH server now works on Windows

kylecarbs · kylecarbs · commit 12ffaff17ce1 · 2022-02-17T00:15:21.000-06:00
diff --git a/agent/server.go b/agent/server.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/console/pty"
 	"github.com/coder/coder/peer"
 	"github.com/coder/coder/peerbroker"
+	"github.com/coder/coder/pty"
 	"github.com/coder/retry"
 
 	"github.com/gliderlabs/ssh"
diff --git a/agent/server_test.go b/agent/server_test.go
@@ -66,6 +66,3 @@ func TestAgent(t *testing.T) {
 		require.NoError(t, err)
 	})
 }
-
-// Read + write for input
-// Read + write for output
diff --git a/cli/clitest/clitest_test.go b/cli/clitest/clitest_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/coder/coder/console"
+	"github.com/coder/coder/pty/ptytest"
 )
 
 func TestMain(m *testing.M) {
@@ -21,11 +21,12 @@ func TestCli(t *testing.T) {
 	client := coderdtest.New(t)
 	cmd, config := clitest.New(t)
 	clitest.SetupConfig(t, client, config)
-	cons := console.New(t, cmd)
+	pty := ptytest.New(t)
+	cmd.SetIn(pty.Input())
+	cmd.SetOut(pty.Output())
 	go func() {
 		err := cmd.Execute()
 		require.NoError(t, err)
 	}()
-	_, err := cons.ExpectString("coder")
-	require.NoError(t, err)
+	pty.ExpectMatch("coder")
 }
