X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Ffiles_test.go;h=1313fdfed18548947a6cda319b1db862d8de8dbb;hb=3473766d8afb07cb0685694656947883cbbd1138;hp=c9af0f23596f8fd08a8fa4c9526cc1984ff2240c;hpb=641203fda8f7da72c74562c9dc910ca108116f11;p=safcm%2Fsafcm.git diff --git a/cmd/safcm/config/files_test.go b/cmd/safcm/config/files_test.go index c9af0f2..1313fdf 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) { @@ -190,15 +188,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) }) } }