pkg/testutil: Add utility for setting umask during tests.

pkg/cli/lscolors/feature_nonunix_test.go

@@ -5,7 +5,6 @@ package lscolors
 
 import (
 	"errors"
-	"testing"
 )
 
 var errNotSupportedOnNonUNIX = errors.New("not supported on non-UNIX OS")
@@ -13,5 +12,3 @@ var errNotSupportedOnNonUNIX = errors.New("not supported on non-UNIX OS")
 func createNamedPipe(fname string) error {
 	return errNotSupportedOnNonUNIX
 }
-
-func setUmask(t *testing.T, m int) {}

pkg/cli/lscolors/feature_test.go

@@ -18,7 +18,7 @@ type opt struct {
 
 func TestDetermineFeature(t *testing.T) {
 	testutil.InTempDir(t)
-	setUmask(t, 0)
+	testutil.Umask(t, 0)
 
 	test := func(name, fname string, wantFeature feature, o opt) {
 		t.Helper()

pkg/cli/lscolors/feature_unix_test.go

@@ -4,16 +4,9 @@
 package lscolors
 
 import (
-	"testing"
-
 	"golang.org/x/sys/unix"
 )
 
 func createNamedPipe(fname string) error {
 	return unix.Mkfifo(fname, 0600)
 }
-
-func setUmask(t *testing.T, m int) {
-	save := unix.Umask(m)
-	t.Cleanup(func() { unix.Umask(save) })
-}

pkg/testutil/umask.go

@@ -0,0 +1,7 @@
+package testutil
+
+// Umask sets the umask for the duration of the test, and restores it afterwards.
+func Umask(c Cleanuper, m int) {
+	save := umask(m)
+	c.Cleanup(func() { umask(save) })
+}

pkg/testutil/umask_unix.go

@@ -0,0 +1,8 @@
+//go:build !windows && !plan9 && !js
+// +build !windows,!plan9,!js
+
+package testutil
+
+import "golang.org/x/sys/unix"
+
+var umask = unix.Umask

pkg/testutil/umask_windows.go

@@ -0,0 +1,3 @@
+package testutil
+
+func umask(int) int { return 0 }