X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fpackages_debian_test.go;h=bd54a2fdd5d927ae2372aef4f86161813ccf936f;hb=b088bf0b7e872d0e6ba230d4e4b79625af4fb17e;hp=ff0e066ae0d8e8ad806bdd4d1fbfe1d7521c6dc0;hpb=4299c5d0946ecfa034e9eefe6b16e50bab94a820;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 ff0e066..bd54a2f 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) {
@@ -42,7 +40,7 @@ func TestSyncPackagesDebian(t *testing.T) {
 	}{
 
 		// NOTE: Also update MsgSyncResp in safcm test cases when
-		// changing anything here!
+		// changing the MsgSyncResp struct!
 
 		{
 			"packages already installed",
@@ -310,21 +308,11 @@ install ok installed	golang-1.16-src
 			})
 
 			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)
-			}
+			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)
 		})
 	}
 }