testing: use t.Cleanup() for test utilities

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

term_test.go

@@ -7,29 +7,38 @@ import (
 	"os"
 	"testing"
 
-	"github.com/creack/pty"
+	cpty "github.com/creack/pty"
 	"github.com/google/go-cmp/cmp"
 	"gotest.tools/v3/assert"
 )
 
-func newTtyForTest(t *testing.T) (*os.File, *os.File) {
+func newTTYForTest(t *testing.T) *os.File {
 	t.Helper()
-	pty, tty, err := pty.Open()
+	pty, tty, err := cpty.Open()
 	if err != nil {
 		t.Fatalf("error creating pty: %v", err)
+	} else {
+		t.Cleanup(func() {
+			_ = pty.Close()
+			_ = tty.Close()
+		})
 	}
-
-	return pty, tty
+	return tty
 }
 
-func newTempFile() (*os.File, error) {
-	return os.CreateTemp(os.TempDir(), "temp")
+func newTempFile(t *testing.T) *os.File {
+	t.Helper()
+	tmpFile, err := os.CreateTemp(t.TempDir(), "temp")
+	if err != nil {
+		t.Fatalf("error creating tempfile: %v", err)
+	} else {
+		t.Cleanup(func() { _ = tmpFile.Close() })
+	}
+	return tmpFile
 }
 
 func TestGetWinsize(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	winSize, err := GetWinsize(tty.Fd())
 	assert.NilError(t, err)
 	assert.Assert(t, winSize != nil)
@@ -45,9 +54,7 @@ func TestGetWinsize(t *testing.T) {
 var cmpWinsize = cmp.AllowUnexported(Winsize{})
 
 func TestSetWinsize(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	winSize, err := GetWinsize(tty.Fd())
 	assert.NilError(t, err)
 	assert.Assert(t, winSize != nil)
@@ -60,51 +67,38 @@ func TestSetWinsize(t *testing.T) {
 }
 
 func TestGetFdInfo(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	inFd, isTerminal := GetFdInfo(tty)
 	assert.Equal(t, inFd, tty.Fd())
 	assert.Equal(t, isTerminal, true)
-	tmpFile, err := newTempFile()
-	assert.NilError(t, err)
-	defer tmpFile.Close()
+	tmpFile := newTempFile(t)
 	inFd, isTerminal = GetFdInfo(tmpFile)
 	assert.Equal(t, inFd, tmpFile.Fd())
 	assert.Equal(t, isTerminal, false)
 }
 
 func TestIsTerminal(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	isTerminal := IsTerminal(tty.Fd())
 	assert.Equal(t, isTerminal, true)
-	tmpFile, err := newTempFile()
-	assert.NilError(t, err)
-	defer tmpFile.Close()
+	tmpFile := newTempFile(t)
 	isTerminal = IsTerminal(tmpFile.Fd())
 	assert.Equal(t, isTerminal, false)
 }
 
 func TestSaveState(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	state, err := SaveState(tty.Fd())
 	assert.NilError(t, err)
 	assert.Assert(t, state != nil)
-	pty, tty = newTtyForTest(t)
-	defer pty.Close()
+	tty = newTTYForTest(t)
 	defer tty.Close()
 	err = RestoreTerminal(tty.Fd(), state)
 	assert.NilError(t, err)
 }
 
 func TestDisableEcho(t *testing.T) {
-	pty, tty := newTtyForTest(t)
-	defer pty.Close()
-	defer tty.Close()
+	tty := newTTYForTest(t)
 	state, err := SetRawTerminal(tty.Fd())
 	defer RestoreTerminal(tty.Fd(), state)
 	assert.NilError(t, err)