fix: Fix close in pty and ptytest (#3392)

mafredri · web-flow · commit b10a1b84e5d0 · 2022-08-05T21:31:54.000+03:00
diff --git a/pty/pty_other.go b/pty/pty_other.go
@@ -78,7 +78,7 @@ func (p *otherPty) Close() error {
 
 	err := p.pty.Close()
 	err2 := p.tty.Close()
-	if err != nil {
+	if err == nil {
 		err = err2
 	}
 
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -62,7 +62,7 @@ func create(t *testing.T, ptty pty.PTY, name string) *PTY {
 		_ = out.closeErr(err)
 	}()
 	t.Cleanup(func() {
-		_ = out.Close
+		_ = out.Close()
 		_ = ptty.Close()
 		<-copyDone
 	})
diff --git a/pty/start_other.go b/pty/start_other.go
@@ -28,6 +28,7 @@ func startPty(cmd *exec.Cmd) (PTY, Process, error) {
 	err = cmd.Start()
 	if err != nil {
 		_ = ptty.Close()
+		_ = tty.Close()
 		if runtime.GOOS == "darwin" && strings.Contains(err.Error(), "bad file descriptor") {
 			// MacOS has an obscure issue where the PTY occasionally closes
 			// before it's used. It's unknown why this is, but creating a new
