X-Git-Url: https://ruderich.org/simon/gitweb/?p=safcm%2Fsafcm.git;a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fpackages_debian_test.go;h=a51a6a9d3f319abc966fbcec473a2c4e3a103d0d;hp=ff0e066ae0d8e8ad806bdd4d1fbfe1d7521c6dc0;hb=4e46a22dc5165611b254081597c65969c8c2ce39;hpb=4299c5d0946ecfa034e9eefe6b16e50bab94a820

diff --git a/cmd/safcm-remote/sync/packages_debian_test.go b/cmd/safcm-remote/sync/packages_debian_test.go
index ff0e066..a51a6a9 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",
@@ -75,7 +73,7 @@ install ok installed	package-two
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
+				"4: sync remote: packages: checking package-one package-two (debian detected)",
 				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
 				`5: sync remote: packages: command stdout:
 install ok installed	golang
@@ -86,7 +84,6 @@ install ok installed	golang-1.16-src
 hold ok installed	package-one
 install ok installed	package-two
 `,
-				"4: sync remote: packages: checking package-one package-two",
 			},
 			safcm.MsgSyncResp{},
 			nil,
@@ -140,7 +137,7 @@ install ok installed	package-two
 				),
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
+				"4: sync remote: packages: checking package-one package-two package-three (debian detected)",
 				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
 				`5: sync remote: packages: command stdout:
 install ok installed	golang
@@ -150,7 +147,6 @@ install ok installed	golang-1.16-go
 install ok installed	golang-1.16-src
 install ok installed	package-two
 `,
-				"4: sync remote: packages: checking package-one package-two package-three",
 				"3: sync remote: packages: installing package-one package-three",
 				`4: sync remote: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-three"`,
 				"5: sync remote: packages: command output:\nfake stdout/stderr",
@@ -217,7 +213,7 @@ install ok installed	golang-1.16-src
 				),
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
+				"4: sync remote: packages: checking package-one package-two (debian detected)",
 				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
 				`5: sync remote: packages: command stdout:
 install ok installed	golang
@@ -226,7 +222,6 @@ install ok installed	golang-1.16-doc
 install ok installed	golang-1.16-go
 install ok installed	golang-1.16-src
 `,
-				"4: sync remote: packages: checking package-one package-two",
 				"3: sync remote: packages: installing package-one package-two",
 				`4: sync remote: packages: running "/usr/bin/apt-get" "install" "--assume-yes" "--no-upgrade" "--no-install-recommends" "-o" "Dpkg::Options::=--force-confdef" "-o" "Dpkg::Options::=--force-confold" "package-one" "package-two"`,
 				"5: sync remote: packages: command output:\nfake stdout/stderr",
@@ -274,7 +269,7 @@ install ok installed	golang-1.16-src
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
+				"4: sync remote: packages: checking package-one package-two (debian detected)",
 				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
 				`5: sync remote: packages: command stdout:
 install ok installed	golang
@@ -283,7 +278,6 @@ install ok installed	golang-1.16-doc
 install ok installed	golang-1.16-go
 install ok installed	golang-1.16-src
 `,
-				"4: sync remote: packages: checking package-one package-two",
 			},
 			safcm.MsgSyncResp{
 				PackageChanges: []safcm.PackageChange{
@@ -310,21 +304,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)
 		})
 	}
 }