X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync_sync_test.go;h=614b5b0c72254dc17240db2a5e6888d9d355547e;hb=a975ad977fa48ac38a1955041cc559e77aa4d968;hp=7f478ffc0c7c465430e407fb6b562d43ce7d0703;hpb=ba1a93368ed95d7160062f60fb8b579bc178d3aa;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync_sync_test.go b/cmd/safcm/sync_sync_test.go
index 7f478ff..614b5b0 100644
--- a/cmd/safcm/sync_sync_test.go
+++ b/cmd/safcm/sync_sync_test.go
@@ -1,17 +1,5 @@
-// Copyright (C) 2021  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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package main
 
@@ -62,8 +50,9 @@ func TestHostSyncReq(t *testing.T) {
 					"host1.example.org",
 				},
 				Files: map[string]*safcm.File{
-					"/": {Path: "/",
+					"/": {
 						OrigGroup: "group",
+						Path:      "/",
 						Mode:      fs.ModeDir | 0755 | fs.ModeSetgid,
 						Uid:       -1,
 						Gid:       -1,
@@ -225,26 +214,26 @@ func TestHostSyncReq(t *testing.T) {
 				Groups: []string{"all", "group-b", "group-a", "host1.example.org"},
 				Files: map[string]*safcm.File{
 					"/": {
+						OrigGroup: "host1.example.org",
 						Path:      "/",
 						Mode:      fs.ModeDir | 0755,
 						Uid:       -1,
 						Gid:       -1,
-						OrigGroup: "host1.example.org",
 					},
 					"/etc": {
+						OrigGroup: "host1.example.org",
 						Path:      "/etc",
 						Mode:      fs.ModeDir | 0755,
 						Uid:       -1,
 						Gid:       -1,
-						OrigGroup: "host1.example.org",
 					},
 					"/etc/dir-to-file": {
+						OrigGroup: "group-a",
 						Path:      "/etc/dir-to-file",
 						Mode:      0644,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("dir-to-file: from group-a\n"),
-						OrigGroup: "group-a",
 					},
 					"/etc/dir-to-filex": {
 						OrigGroup: "group-b",
@@ -255,12 +244,12 @@ func TestHostSyncReq(t *testing.T) {
 						Data:      []byte("dir-to-filex\n"),
 					},
 					"/etc/dir-to-link": {
+						OrigGroup: "group-a",
 						Path:      "/etc/dir-to-link",
 						Mode:      fs.ModeSymlink | 0777,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("target"),
-						OrigGroup: "group-a",
 					},
 					"/etc/dir-to-linkx": {
 						OrigGroup: "group-b",
@@ -271,42 +260,42 @@ func TestHostSyncReq(t *testing.T) {
 						Data:      []byte("dir-to-linkx\n"),
 					},
 					"/etc/file-to-dir": {
+						OrigGroup: "group-a",
 						Path:      "/etc/file-to-dir",
 						Mode:      fs.ModeDir | 0755,
 						Uid:       -1,
 						Gid:       -1,
-						OrigGroup: "group-a",
 					},
 					"/etc/file-to-dir/file": {
+						OrigGroup: "group-a",
 						Path:      "/etc/file-to-dir/file",
 						Mode:      0644,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("file: from group-a\n"),
-						OrigGroup: "group-a",
 					},
 					"/etc/file-to-dir/dir": {
+						OrigGroup: "group-a",
 						Path:      "/etc/file-to-dir/dir",
 						Mode:      fs.ModeDir | 0755,
 						Uid:       -1,
 						Gid:       -1,
-						OrigGroup: "group-a",
 					},
 					"/etc/file-to-dir/dir/file2": {
+						OrigGroup: "group-a",
 						Path:      "/etc/file-to-dir/dir/file2",
 						Mode:      0644,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("file2: from group-a\n"),
-						OrigGroup: "group-a",
 					},
 					"/etc/motd": {
+						OrigGroup: "host1.example.org",
 						Path:      "/etc/motd",
 						Mode:      0644,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("motd: from host1\n"),
-						OrigGroup: "host1.example.org",
 					},
 				},
 			},
@@ -328,19 +317,19 @@ func TestHostSyncReq(t *testing.T) {
 				Groups: []string{"all", "group-b", "group-a", "host1.example.org"},
 				Files: map[string]*safcm.File{
 					"/": {
+						OrigGroup: "group-a",
 						Path:      "/",
 						Mode:      fs.ModeDir | 0755,
 						Uid:       -1,
 						Gid:       -1,
-						OrigGroup: "group-a",
 					},
 					"/file.txt": {
+						OrigGroup: "group-a",
 						Path:      "/file.txt",
 						Mode:      0644,
 						Uid:       -1,
 						Gid:       -1,
 						Data:      []byte("file.txt: from group-a\n"),
-						OrigGroup: "group-a",
 					},
 				},
 			},