X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Ffiles_test.go;h=f989ee32821929c6d00ffbd46669f56609318cd7;hb=7181f7906e7fb6e73ebc0daa46975bfa9c71478f;hp=cc963c94a232ea3df776c11b45c76500f06ce110;hpb=8bf2ac237af2faacd963485696c499c46b5a11e5;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go
index cc963c9..f989ee3 100644
--- a/cmd/safcm/config/files_test.go
+++ b/cmd/safcm/config/files_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2021  Simon Ruderich
+// Copyright (C) 2021-2024  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -23,12 +23,12 @@ import (
 	"testing"
 
 	"ruderich.org/simon/safcm"
-	ft "ruderich.org/simon/safcm/cmd/safcm-remote/sync/filetest"
+	ft "ruderich.org/simon/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)
 	}
@@ -39,7 +39,7 @@ func TestLoadFiles(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer os.Chdir(cwd)
+	defer os.Chdir(cwd) //nolint:errcheck
 
 	err = os.Chdir("../testdata/project")
 	if err != nil {
@@ -55,7 +55,7 @@ func TestLoadFiles(t *testing.T) {
 	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,7 +66,8 @@ 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)
 	}
 
 	ft.CreateFifo("files-invalid-type/files/invalid", 0644)