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

diff --git a/cmd/safcm/config/groups_test.go b/cmd/safcm/config/groups_test.go
index 68f18ba..9c0acda 100644
--- a/cmd/safcm/config/groups_test.go
+++ b/cmd/safcm/config/groups_test.go
@@ -18,10 +18,10 @@ package config
 import (
 	"fmt"
 	"os"
-	"reflect"
+	"path/filepath"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
+	"ruderich.org/simon/safcm/testutil"
 )
 
 func TestLoadGroups(t *testing.T) {
@@ -186,27 +186,14 @@ func TestLoadGroups(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.path, func(t *testing.T) {
-		err := os.Chdir(tc.path)
-		if err != nil {
-			t.Fatal(err)
-		}
+			err := os.Chdir(filepath.Join(cwd, tc.path))
+			if err != nil {
+				t.Fatal(err)
+			}
 
-		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)
-		}
-
-		err = os.Chdir(cwd)
-		if err != nil {
-			t.Fatal(err)
-		}
+			res, err := LoadGroups(tc.cfg, tc.hosts)
+			testutil.AssertEqual(t, "res", res, tc.exp)
+			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
 		})
 	}
 }
@@ -318,16 +305,10 @@ func TestResolveHostGroups(t *testing.T) {
 
 	for _, tc := range tests {
 		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)
-		}
+			res, err := ResolveHostGroups(tc.host, allGroups,
+				tc.detected)
+			testutil.AssertEqual(t, "res", res, tc.exp)
+			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
 		})
 	}
 }