X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fpermissions_test.go;h=98a1609fa64ff22a447824e1142d40376211a985;hb=HEAD;hp=ba1d505f9f019f314d7e02c80fa63790f298bf34;hpb=4299c5d0946ecfa034e9eefe6b16e50bab94a820;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/permissions_test.go b/cmd/safcm/config/permissions_test.go
index ba1d505..98a1609 100644
--- a/cmd/safcm/config/permissions_test.go
+++ b/cmd/safcm/config/permissions_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 config
 
@@ -19,12 +7,10 @@ import (
 	"fmt"
 	"io/fs"
 	"os"
-	"reflect"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	"ruderich.org/simon/safcm"
+	"ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadPermissions(t *testing.T) {
@@ -32,7 +18,7 @@ func TestLoadPermissions(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 {
@@ -89,6 +75,19 @@ This is GNU/Linux host
 {{if .InGroup "detected_freebsd"}}
 This is FreeBSD host
 {{end}}
+
+{{if .InGroup "all"}}
+all
+{{end}}
+{{if .InGroup "host1.example.org"}}
+host1.example.org
+{{end}}
+{{if .InGroup "host2"}}
+host2
+{{end}}
+{{if .InGroup "host3.example.net"}}
+host3.example.net
+{{end}}
 `),
 				},
 				"/etc/rc.local": {
@@ -223,6 +222,31 @@ This is FreeBSD host
 			},
 			fmt.Errorf("permissions-invalid-permission-int/permissions.yaml: invalid permission 066066 (expected e.g. 0644 or 01777)"),
 		},
+		{
+			"permissions-invalid-permission-negative",
+			map[string]*safcm.File{
+				"/": {
+					Path: "/",
+					Mode: fs.ModeDir | 0755,
+					Uid:  -1,
+					Gid:  -1,
+				},
+				"/etc": {
+					Path: "/etc",
+					Mode: fs.ModeDir | 0755,
+					Uid:  -1,
+					Gid:  -1,
+				},
+				"/etc/resolv.conf": {
+					Path: "/etc/resolv.conf",
+					Mode: 0644,
+					Uid:  -1,
+					Gid:  -1,
+					Data: []byte("nameserver ::1\n"),
+				},
+			},
+			fmt.Errorf("permissions-invalid-permission-negative/permissions.yaml: invalid permission -042 (expected e.g. 0644 or 01777)"),
+		},
 	}
 
 	for _, tc := range tests {
@@ -235,14 +259,8 @@ This is FreeBSD host
 			}
 			err = LoadPermissions(tc.group, files)
 
-			if !reflect.DeepEqual(tc.exp, files) {
-				t.Errorf("res: %s", cmp.Diff(tc.exp, files))
-			}
-			// Ugly but the simplest way to compare errors (including nil)
-			if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-				t.Errorf("err = %#v, want %#v",
-					err, tc.expErr)
-			}
+			testutil.AssertEqual(t, "res", files, tc.exp)
+			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
 		})
 	}
 }