Fix pty tests on Windows

kylecarbs · kylecarbs · commit 42656a4c32d2 · 2022-02-17T23:15:01.000-06:00
diff --git a/agent/agent.go b/agent/agent.go
@@ -208,6 +208,7 @@ func (*server) handleSSHSession(session ssh.Session) error {
 			_, _ = io.Copy(session, ptty.Output())
 		}()
 		_, _ = process.Wait()
+		_ = ptty.Close()
 		return nil
 	}
 
diff --git a/pty/start_other.go b/pty/start_other.go
@@ -32,9 +32,5 @@ func startPty(cmd *exec.Cmd) (PTY, *os.Process, error) {
 		pty: ptty,
 		tty: tty,
 	}
-	go func() {
-		_ = cmd.Wait()
-		_ = oPty.Close()
-	}()
 	return oPty, cmd.Process, nil
 }
diff --git a/pty/start_windows.go b/pty/start_windows.go
@@ -83,10 +83,6 @@ func startPty(cmd *exec.Cmd) (PTY, *os.Process, error) {
 	if err != nil {
 		return nil, nil, xerrors.Errorf("find process %d: %w", processInfo.ProcessId, err)
 	}
-	go func() {
-		_, _ = process.Wait()
-		_ = pty.Close()
-	}()
 	return pty, process, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,7 @@ func (*server) handleSSHSession(session ssh.Session) error {`
`208`	`208`	`_, _ = io.Copy(session, ptty.Output())`
`209`	`209`	`}()`
`210`	`210`	`_, _ = process.Wait()`
	`211`	`+ _ = ptty.Close()`
`211`	`212`	`return nil`
`212`	`213`	`}`
`213`	`214`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,5 @@ func startPty(cmd exec.Cmd) (PTY, os.Process, error) {`
`32`	`32`	`pty: ptty,`
`33`	`33`	`tty: tty,`
`34`	`34`	`}`
`35`		`- go func() {`
`36`		`- _ = cmd.Wait()`
`37`		`- _ = oPty.Close()`
`38`		`- }()`
`39`	`35`	`return oPty, cmd.Process, nil`
`40`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,6 @@ func startPty(cmd exec.Cmd) (PTY, os.Process, error) {`
`83`	`83`	`if err != nil {`
`84`	`84`	`return nil, nil, xerrors.Errorf("find process %d: %w", processInfo.ProcessId, err)`
`85`	`85`	`}`
`86`		`- go func() {`
`87`		`- _, _ = process.Wait()`
`88`		`- _ = pty.Close()`
`89`		`- }()`
`90`	`86`	`return pty, process, nil`
`91`	`87`	`}`
`92`	`88`