X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fpackages_debian_test.go;h=0e3411dd661b7350a593289f4bbf0a634cce3c1c;hb=778665c07c9cf6f434dbd1ee867fe8b8636f55c0;hp=51b6b746865da76bee636a81e7717a9d1ca9b995;hpb=992eaae7fec45c2d58fff89d1bc0ae920a899296;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/packages_debian_test.go b/cmd/safcm-remote/sync/packages_debian_test.go
index 51b6b74..0e3411d 100644
--- a/cmd/safcm-remote/sync/packages_debian_test.go
+++ b/cmd/safcm-remote/sync/packages_debian_test.go
@@ -20,12 +20,10 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"reflect"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	"ruderich.org/simon/safcm"
+	"ruderich.org/simon/safcm/testutil"
 )
 
 func TestSyncPackagesDebian(t *testing.T) {
@@ -301,30 +299,20 @@ install ok installed	golang-1.16-src
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-		s, res := prepareSync(tc.req, &testRunner{
-			t:         t,
-			expCmds:   tc.expCmds,
-			resStdout: tc.stdout,
-			resStderr: tc.stderr,
-			resError:  tc.errors,
-		})
+			s, res := prepareSync(tc.req, &testRunner{
+				t:         t,
+				expCmds:   tc.expCmds,
+				resStdout: tc.stdout,
+				resStderr: tc.stderr,
+				resError:  tc.errors,
+			})
 
-		err := s.syncPackagesDebian()
-		// 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)
-		}
-		dbg := res.Wait()
+			err := s.syncPackagesDebian()
+			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
+			dbg := res.Wait()
 
-		if !reflect.DeepEqual(tc.expResp, s.resp) {
-			t.Errorf("resp: %s",
-				cmp.Diff(tc.expResp, s.resp))
-		}
-		if !reflect.DeepEqual(tc.expDbg, dbg) {
-			t.Errorf("dbg: %s",
-				cmp.Diff(tc.expDbg, dbg))
-		}
+			testutil.AssertEqual(t, "resp", s.resp, tc.expResp)
+			testutil.AssertEqual(t, "dbg", dbg, tc.expDbg)
 		})
 	}
 }