X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;fp=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=91a85befb83c24d9ea494e991e6699318c0289f8;hb=583a2695a3ddc9c98e0a03d9f1bad8df30afe887;hp=e7864ba8b8080e489da5964663c1496308599bd1;hpb=304a68c565d58ae52dd39cf6e2d6ef52cada7d19;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index e7864ba..91a85be 100644
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -261,43 +261,38 @@ 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,
+						Uid:       0,
+						Gid:       0,
 						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",
 					},
 				},
@@ -756,10 +751,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 +761,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",