WIP

mtojek · mtojek · commit 593a891e9523 · 2022-12-07T09:06:02.000+01:00
diff --git a/pty/pty_other.go b/pty/pty_other.go
@@ -114,9 +114,17 @@ func (p *otherPty) Resize(height uint16, width uint16) error {
 }
 
 func (p *otherPty) Close() error {
+	if p.opts.logger != nil {
+		p.opts.logger.Println("Will close...")
+	}
+
 	p.mutex.Lock()
 	defer p.mutex.Unlock()
 
+	if p.opts.logger != nil {
+		p.opts.logger.Println("Closing...")
+	}
+
 	if p.closed {
 		return p.err
 	}
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -152,7 +152,7 @@ func (p *PTY) ExpectMatch(str string) string {
 		p.logf("matched %q = %q", str, buffer.String())
 		return buffer.String()
 	case <-timeout.Done():
-		// Ensure gorouine is cleaned up before test exit.
+		// Ensure goroutine is cleaned up before test exit.
 		_ = p.out.closeErr(p.Close())
 		<-match
 
@@ -202,7 +202,7 @@ func logf(t *testing.T, name, format string, args ...interface{}) {
 func fatalf(t *testing.T, name, reason, format string, args ...interface{}) {
 	t.Helper()
 
-	panic(fmt.Sprintf("%s: %s %s", name, reason, fmt.Sprintf(format, args...)))
+	t.Fatal(fmt.Sprintf("%s: %s %s", name, reason, fmt.Sprintf(format, args...)))
 }
 
 // stdbuf is like a buffered stdout, it buffers writes until read.
