X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Ffiles_test.go;h=7ad12d62f32c6516efa2736e770924dfdab2ce42;hb=902f4dd358b7b3f27faccba2e40a04abc760546f;hp=6124e8ad93b8a2b48eb59ad658b3689251096eeb;hpb=7c4e5d64e25acec7209a54a15836b4481c450416;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go
index 6124e8a..7ad12d6 100644
--- a/cmd/safcm/config/files_test.go
+++ b/cmd/safcm/config/files_test.go
@@ -20,15 +20,15 @@ import (
 	"io/fs"
 	"os"
 	"runtime"
-	"syscall"
 	"testing"
 
 	"ruderich.org/simon/safcm"
+	ft "ruderich.org/simon/safcm/cmd/safcm-remote/sync/filetest"
 	"ruderich.org/simon/safcm/testutil"
 )
 
-func chmod(name string, perm int) {
-	err := os.Chmod(name, FullPermToFileMode(perm))
+func chmod(name string, mode fs.FileMode) {
+	err := os.Chmod(name, mode)
 	if err != nil {
 		panic(err)
 	}
@@ -47,15 +47,15 @@ func TestLoadFiles(t *testing.T) {
 	}
 
 	// Regular users cannot create sticky files
-	skipInvalidSticky := runtime.GOOS == "freebsd" ||
-		runtime.GOOS == "openbsd"
+	skipInvalidSticky := os.Getuid() != 0 &&
+		(runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd")
 
 	chmod("files-invalid-perm-dir/files", 0500)
 	defer chmod("files-invalid-perm-dir/files", 0700)
 	chmod("files-invalid-perm-dir/files/etc/", 0755)
 	chmod("files-invalid-perm-dir/files/etc/resolv.conf", 0644)
 	chmod("files-invalid-perm-dir-setgid/files", 0755)
-	chmod("files-invalid-perm-dir-setgid/files/etc/", 02755)
+	chmod("files-invalid-perm-dir-setgid/files/etc/", 0755|fs.ModeSetgid)
 	chmod("files-invalid-perm-dir-setgid/files/etc/resolv.conf", 0644)
 	chmod("files-invalid-perm-file/files", 0755)
 	chmod("files-invalid-perm-file/files/etc/", 0755)
@@ -66,13 +66,11 @@ func TestLoadFiles(t *testing.T) {
 	if !skipInvalidSticky {
 		chmod("files-invalid-perm-file-sticky/files", 0755)
 		chmod("files-invalid-perm-file-sticky/files/etc", 0755)
-		chmod("files-invalid-perm-file-sticky/files/etc/resolv.conf", 01644)
+		chmod("files-invalid-perm-file-sticky/files/etc/resolv.conf",
+			0644|fs.ModeSticky)
 	}
 
-	err = syscall.Mkfifo("files-invalid-type/files/invalid", 0644)
-	if err != nil {
-		t.Fatal(err)
-	}
+	ft.CreateFifo("files-invalid-type/files/invalid", 0644)
 	defer os.Remove("files-invalid-type/files/invalid")
 
 	const errMsg = `