fix: pty close on Windows

mtojek · mtojek · commit e48d4ab48072 · 2022-12-07T12:29:34.000+01:00
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -130,16 +130,16 @@ func (p *ptyWindows) Close() error {
 		return nil
 	}
 	p.closed = true
-	_ = p.outputWrite.Close()
-	_ = p.outputRead.Close()
-	_ = p.inputWrite.Close()
-	_ = p.inputRead.Close()
 
 	ret, _, err := procClosePseudoConsole.Call(uintptr(p.console))
 	if ret < 0 {
 		return xerrors.Errorf("close pseudo console: %w", err)
 	}
 
+	_ = p.outputWrite.Close()
+	_ = p.outputRead.Close()
+	_ = p.inputWrite.Close()
+	_ = p.inputRead.Close()
 	return nil
 }
 
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -126,7 +126,7 @@ type PTY struct {
 func (p *PTY) ExpectMatch(str string) string {
 	p.t.Helper()
 
-	timeout, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
+	timeout, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
 	defer cancel()
 
 	var buffer bytes.Buffer

Original file line number	Diff line number	Diff line change
`@@ -130,16 +130,16 @@ func (p *ptyWindows) Close() error {`
`130`	`130`	`return nil`
`131`	`131`	`}`
`132`	`132`	`p.closed = true`
`133`		`- _ = p.outputWrite.Close()`
`134`		`- _ = p.outputRead.Close()`
`135`		`- _ = p.inputWrite.Close()`
`136`		`- _ = p.inputRead.Close()`
`137`	`133`
`138`	`134`	`ret, _, err := procClosePseudoConsole.Call(uintptr(p.console))`
`139`	`135`	`if ret < 0 {`
`140`	`136`	`return xerrors.Errorf("close pseudo console: %w", err)`
`141`	`137`	`}`
`142`	`138`
	`139`	`+ _ = p.outputWrite.Close()`
	`140`	`+ _ = p.outputRead.Close()`
	`141`	`+ _ = p.inputWrite.Close()`
	`142`	`+ _ = p.inputRead.Close()`
`143`	`143`	`return nil`
`144`	`144`	`}`
`145`	`145`