X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=879fefda156b8789d6b0818459a05b15eb3aa9ae;hb=1934f1ab83306dff45310d5b45e2a99c97e28c35;hp=e7864ba8b8080e489da5964663c1496308599bd1;hpb=3473766d8afb07cb0685694656947883cbbd1138;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index e7864ba..879fefd 100644
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -261,43 +261,31 @@ func TestSyncFiles(t *testing.T) {
 			// don't want to modify the running system. Use this
 			// test (and the one below for triggers) as a basic
 			// check that absolute paths work.
+			//
+			// Use numeric IDs as not all systems use root/root;
+			// for example BSDs use root/wheel.
 			"absolute paths: no change",
 			safcm.MsgSyncReq{
 				Files: map[string]*safcm.File{
 					"/": {
 						Path:      "/",
 						Mode:      fs.ModeDir | 0755,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
+						Uid:       0,
+						Gid:       0,
 						OrigGroup: "group",
 					},
 					"/etc": {
 						Path:      "/etc",
 						Mode:      fs.ModeDir | 0755,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
+						Uid:       0,
+						Gid:       0,
 						OrigGroup: "group",
 					},
 					"/tmp": {
 						Path:      "/tmp",
 						Mode:      fs.ModeDir | 0777 | fs.ModeSticky,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
-						OrigGroup: "group",
-					},
-					"/var/tmp": {
-						Path:      "/var/tmp",
-						Mode:      fs.ModeDir | 0777 | fs.ModeSticky,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
+						Uid:       0,
+						Gid:       0,
 						OrigGroup: "group",
 					},
 				},
@@ -312,7 +300,6 @@ func TestSyncFiles(t *testing.T) {
 				`4: sync remote: files: "/" (group): unchanged`,
 				`4: sync remote: files: "/etc" (group): unchanged`,
 				`4: sync remote: files: "/tmp" (group): unchanged`,
-				`4: sync remote: files: "/var/tmp" (group): unchanged`,
 			},
 			nil,
 		},
@@ -756,10 +743,8 @@ func TestSyncFiles(t *testing.T) {
 					"/": {
 						Path:      "/",
 						Mode:      fs.ModeDir | 0755,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
+						Uid:       0,
+						Gid:       0,
 						OrigGroup: "group",
 						TriggerCommands: []string{
 							"echo trigger /",
@@ -768,10 +753,8 @@ func TestSyncFiles(t *testing.T) {
 					"/tmp": {
 						Path:      "/tmp",
 						Mode:      fs.ModeDir | 0777 | fs.ModeSticky,
-						User:      "root",
-						Uid:       -1,
-						Group:     "root",
-						Gid:       -1,
+						Uid:       0,
+						Gid:       0,
 						OrigGroup: "group",
 						TriggerCommands: []string{
 							"echo trigger /tmp",