X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fconfig%2Fgroups_test.go;h=9c0acda892585577510a26d3eab5640694fecfb3;hb=3473766d8afb07cb0685694656947883cbbd1138;hp=cf6cd6e088cd48d3789fb2f618f903eb1e420dcc;hpb=641203fda8f7da72c74562c9dc910ca108116f11;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go
index cf6cd6e..9c0acda 100644
--- a/cmd/safcm/config/groups_test.go
+++ b/cmd/safcm/config/groups_test.go
@@ -19,10 +19,9 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"reflect"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
+	"ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadGroups(t *testing.T) {
@@ -193,15 +192,8 @@ func TestLoadGroups(t *testing.T) {
 			}
 
 			res, err := LoadGroups(tc.cfg, tc.hosts)
-
-			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)
 		})
 	}
 }
@@ -315,14 +307,8 @@ func TestResolveHostGroups(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			res, err := ResolveHostGroups(tc.host, allGroups,
 				tc.detected)
-			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)
 		})
 	}
 }