tests: use consistent order of safcm.File struct members

[safcm/safcm.git] / remote / sync / files_test.go

diff --git a/remote/sync/files_test.go b/remote/sync/files_test.go
index 48d54fca062812974317958ae28ecbc8c77c0776..ded6614e2c35fbc246658ceff4a1bd951590a500 100644 (file)
--- a/remote/sync/files_test.go
+++ b/remote/sync/files_test.go
@@ -81,26 +81,26 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                        },
                                },
                        },
@@ -165,26 +165,26 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                        },
                                },
                        },
@@ -220,12 +220,12 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                User:      "user",
                                                Uid:       1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                        },
                                },
                        },
@@ -244,12 +244,12 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Group:     "group",
                                                Gid:       1,
-                                               OrigGroup: "group",
                                        },
                                },
                        },
@@ -276,25 +276,25 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        "/": {
+                                               OrigGroup: "group",
                                                Path:      "/",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       0,
                                                Gid:       0,
-                                               OrigGroup: "group",
                                        },
                                        "/etc": {
+                                               OrigGroup: "group",
                                                Path:      "/etc",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       0,
                                                Gid:       0,
-                                               OrigGroup: "group",
                                        },
                                        "/tmp": {
+                                               OrigGroup: "group",
                                                Path:      "/tmp",
                                                Mode:      fs.ModeDir | 0777 | fs.ModeSticky,
                                                Uid:       0,
                                                Gid:       0,
-                                               OrigGroup: "group",
                                        },
                                },
                        },
@@ -318,32 +318,32 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger .",
                                                },
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir",
                                                },
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir/file",
                                                },
@@ -382,32 +382,32 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger .",
                                                },
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir",
                                                },
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir/file",
                                                },
@@ -472,32 +472,32 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger .",
                                                },
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir",
                                                },
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir/file",
                                                },
@@ -563,32 +563,32 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger .",
                                                },
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir",
                                                },
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir/file",
                                                },
@@ -650,32 +650,32 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        ".": {
+                                               OrigGroup: "group",
                                                Path:      ".",
                                                Mode:      fs.ModeDir | 0700,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger .",
                                                },
                                        },
                                        "dir": {
+                                               OrigGroup: "group",
                                                Path:      "dir",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir",
                                                },
                                        },
                                        "dir/file": {
+                                               OrigGroup: "group",
                                                Path:      "dir/file",
                                                Mode:      0644,
                                                Uid:       -1,
                                                Gid:       -1,
                                                Data:      []byte("content\n"),
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger dir/file",
                                                },
@@ -752,31 +752,31 @@ func TestSyncFiles(t *testing.T) {
                        safcm.MsgSyncReq{
                                Files: map[string]*safcm.File{
                                        "/": {
+                                               OrigGroup: "group",
                                                Path:      "/",
                                                Mode:      fs.ModeDir | 0755,
                                                Uid:       0,
                                                Gid:       0,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger /",
                                                },
                                        },
                                        "/tmp": {
+                                               OrigGroup: "group",
                                                Path:      "/tmp",
                                                Mode:      fs.ModeDir | 0777 | fs.ModeSticky,
                                                Uid:       0,
                                                Gid:       0,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger /tmp",
                                                },
                                        },
                                        tmpTestFilePath: {
+                                               OrigGroup: "group",
                                                Path:      tmpTestFilePath,
                                                Mode:      0600,
                                                Uid:       -1,
                                                Gid:       -1,
-                                               OrigGroup: "group",
                                                TriggerCommands: []string{
                                                        "echo trigger /tmp/file",
                                                },