config: permit "all" and host group in .InGroup of templates

[safcm/safcm.git] / cmd / safcm / config / files_test.go

diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go
index c9af0f23596f8fd08a8fa4c9526cc1984ff2240c..82d60c9d4f086e22e6f382b1642a87ca2ab1179c 100644 (file)
--- 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) {
@@ -128,6 +126,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": {
@@ -190,15 +201,8 @@ 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)
-                       }
+                       testutil.AssertEqual(t, "res", res, tc.exp)
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                })
        }
 }