Add tests with different umask values

.github/workflows/main.yml

@@ -53,7 +53,14 @@ jobs:
         [Environment]::SetEnvironmentVariable("Path", $env:PATH, "Machine")
         choco install --yes gpg4win
         echo "C:\Program Files (x86)\GnuPG\bin" >> $env:GITHUB_PATH
+    - name: Test (umask 022)
+      if: runner.os != 'Windows'
+      run: go test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o022" -race ./...
+    - name: Test (umask 002)
+      if: runner.os != 'Windows'
+      run: go test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o002" -race ./...
     - name: Test
+      if: runner.os == 'Windows'
       run: go test -race ./...
   test-release:
     runs-on: ubuntu-18.04

Makefile

@@ -27,7 +27,8 @@ run:
 
 .PHONY: test
 test:
-	$(GO) test ./...
+	$(GO) test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o022" ./...
+	$(GO) test -ldflags="-X github.com/twpayne/chezmoi/internal/chezmoitest.umaskStr=0o002" ./...
 
 .PHONY: generate
 generate: completions assets/scripts/install.sh

cmd/verifycmd_test.go

@@ -28,7 +28,10 @@ func TestVerifyCmd(t *testing.T) {
 			name: "file",
 			root: map[string]interface{}{
 				"/home/user": map[string]interface{}{
-					".bashrc":                         "# contents of .bashrc\n",
+					".bashrc": &vfst.File{
+						Contents: []byte("# contents of .bashrc\n"),
+						Perm:     0o666 &^ chezmoitest.Umask,
+					},
 					".local/share/chezmoi/dot_bashrc": "# contents of .bashrc\n",
 				},
 			},

internal/chezmoitest/chezmoitest.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -122,8 +123,16 @@ func SkipUnlessGOOS(t *testing.T, name string) {
 // WithTestFS calls f with a test filesystem populated with root.
 func WithTestFS(t *testing.T, root interface{}, f func(fs vfs.FS)) {
 	t.Helper()
-	fs, cleanup, err := vfst.NewTestFS(root)
+	fs, cleanup, err := vfst.NewTestFS(root, vfst.BuilderUmask(Umask))
 	require.NoError(t, err)
 	t.Cleanup(cleanup)
 	f(fs)
 }
+
+func mustParseFilemode(s string) os.FileMode {
+	i, err := strconv.ParseInt(s, 0, 32)
+	if err != nil {
+		panic(err)
+	}
+	return os.FileMode(i)
+}

internal/chezmoitest/chezmoitest_unix.go

@@ -3,18 +3,22 @@
 package chezmoitest
 
 import (
-	"os"
 	"syscall"
 )
 
-// Umask is the umask used in tests.
-//
-// If you change this then you will need to update the testscripts in
-// testdata/scripts where permissions after applying umask are hardcoded as
-// strings. Pure Go tests should use this value to ensure that they pass,
-// irrespective of what it is set to. Be aware that the process's umask is a
-// process-level property and cannot be locally changed within individual tests.
-const Umask = os.FileMode(0o022)
+var (
+	umaskStr = "0o022"
+
+	// Umask is the umask used in tests.
+	//
+	// If you change this then you will need to update the testscripts in
+	// testdata/scripts where permissions after applying umask are hardcoded as
+	// strings. Pure Go tests should use this value to ensure that they pass,
+	// irrespective of what it is set to. Be aware that the process's umask is a
+	// process-level property and cannot be locally changed within individual
+	// tests.
+	Umask = mustParseFilemode(umaskStr)
+)
 
 func init() {
 	syscall.Umask(int(Umask))

internal/chezmoitest/chezmoitest_windows.go

@@ -1,6 +1,8 @@
 package chezmoitest
 
-import "os"
+var (
+	umaskStr = "0"
 
-// Umask is the umask used in tests.
-const Umask = os.FileMode(0)
+	// Umask is the umask used in tests.
+	Umask = mustParseFilemode(umaskStr)
+)

main_test.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
@@ -21,6 +22,8 @@ import (
 	"github.com/twpayne/chezmoi/v2/internal/chezmoitest"
 )
 
+var umaskConditionRx = regexp.MustCompile(`\Aumask:([0-7]{3})\z`)
+
 //nolint:interfacer
 func TestMain(m *testing.M) {
 	os.Exit(testscript.RunMain(m, map[string]func() int{
@@ -63,9 +66,12 @@ func TestScript(t *testing.T) {
 				return runtime.GOOS == "linux", nil
 			case "windows":
 				return runtime.GOOS == "windows", nil
-			default:
-				return false, fmt.Errorf("%s: unknown condition", cond)
 			}
+			if m := umaskConditionRx.FindStringSubmatch(cond); m != nil {
+				umask, _ := strconv.ParseInt(m[1], 8, 64)
+				return chezmoitest.Umask == os.FileMode(umask), nil
+			}
+			return false, fmt.Errorf("%s: unknown condition", cond)
 		},
 		Setup: setup,
 	})

testdata/scripts/diff.txt

@@ -1,3 +1,5 @@
+[!umask:022] skip
+
 mkhomedir golden
 mkhomedir
 mksourcedir

testdata/scripts/dumpjson.txt

@@ -1,3 +1,5 @@
+[!umask:022] skip
+
 mksourcedir
 
 chezmoi dump --format=json

testdata/scripts/dumpyaml.txt

@@ -1,3 +1,5 @@
+[!umask:022] skip
+
 mksourcedir
 
 chezmoi dump --format=yaml

testdata/scripts/exclude.txt

@@ -1,3 +1,5 @@
+[!umask:022] skip
+
 # test that chezmoi diff respsects the diff.exclude configuration variable
 chezmoi diff
 [!windows] cmp stdout golden/diff

testdata/scripts/modify.txt

@@ -1,5 +1,6 @@
 [windows] stop 'UNIX only' # FIXME
 [!exec:sed] stop
+[!umask:022] skip
 
 cp golden/.modify home/user
 

testdata/scripts/runscriptdir_unix.txt

@@ -1,4 +1,5 @@
 [windows] skip 'UNIX only'
+[!umask:022] skip
 
 chezmoi apply
 cmpenv stdout golden/apply

testdata/scripts/scriptsubdir_unix.txt

@@ -1,4 +1,5 @@
 [windows] skip 'UNIX only'
+[!umask:022] skip
 
 # test that scripts in subdirectories are run in the subdirectory
 chezmoi apply --force

testdata/scripts/verify.txt

@@ -1,3 +1,5 @@
+[!umask:022] skip
+
 mkhomedir golden
 mkhomedir
 mksourcedir