X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Ffiles_test.go;h=9f226cd7b502e17e28f8db54527e693241753923;hb=4473e968425319e6beae558643bb047a6b01c17a;hp=ef31591fe8fdc31de081f4e3cfbe7a07fb6ef021;hpb=992eaae7fec45c2d58fff89d1bc0ae920a899296;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go
index ef31591..9f226cd 100644
--- a/cmd/safcm/config/files_test.go
+++ b/cmd/safcm/config/files_test.go
@@ -19,13 +19,11 @@ import (
 	"fmt"
 	"io/fs"
 	"os"
-	"reflect"
 	"syscall"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	"ruderich.org/simon/safcm"
+	"ruderich.org/simon/safcm/testutil"
 )
 
 func chmod(name string, perm int) {
@@ -71,6 +69,7 @@ func TestLoadFiles(t *testing.T) {
 	defer os.Remove("files-invalid-type/files/invalid")
 
 	const errMsg = `
+
 The actual permissions and user/group of files and directories are not used
 (except for +x on files). 0644/0755 and current remote user/group is used per
 default. Apply different file permissions via permissions.yaml. To prevent
@@ -128,6 +127,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": {
@@ -189,17 +201,9 @@ This is FreeBSD host
 
 	for _, tc := range tests {
 		t.Run(tc.group, func(t *testing.T) {
-		res, err := LoadFiles(tc.group)
-
-		if !reflect.DeepEqual(tc.exp, res) {
-			t.Errorf("res: %s",
-				cmp.Diff(tc.exp, res))
-		}
-		// 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)
-		}
+			res, err := LoadFiles(tc.group)
+			testutil.AssertEqual(t, "res", res, tc.exp)
+			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
 		})
 	}
 }