X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fpackages_debian_test.go;h=97b8c6182d3f6a9727c05a680bb034ddabb04fff;hb=6a40d84afc959f404f243b1c00ab95dc9dd9c721;hp=0e3411dd661b7350a593289f4bbf0a634cce3c1c;hpb=3473766d8afb07cb0685694656947883cbbd1138;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 0e3411d..97b8c61 100644
--- a/cmd/safcm-remote/sync/packages_debian_test.go
+++ b/cmd/safcm-remote/sync/packages_debian_test.go
@@ -40,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",
@@ -73,9 +73,9 @@ install ok installed	package-two
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
-				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
-				`5: sync remote: packages: command stdout:
+				"4: packages: checking package-one package-two (debian detected)",
+				`4: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
+				`5: packages: command stdout:
 install ok installed	golang
 install ok installed	golang-1.16
 install ok installed	golang-1.16-doc
@@ -84,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,
@@ -138,9 +137,9 @@ install ok installed	package-two
 				),
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
-				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
-				`5: sync remote: packages: command stdout:
+				"4: packages: checking package-one package-two package-three (debian detected)",
+				`4: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
+				`5: packages: command stdout:
 install ok installed	golang
 install ok installed	golang-1.16
 install ok installed	golang-1.16-doc
@@ -148,10 +147,9 @@ 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",
+				"3: packages: installing package-one package-three",
+				`4: 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: packages: command output:\nfake stdout/stderr",
 			},
 			safcm.MsgSyncResp{
 				PackageChanges: []safcm.PackageChange{
@@ -215,19 +213,18 @@ install ok installed	golang-1.16-src
 				),
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
-				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
-				`5: sync remote: packages: command stdout:
+				"4: packages: checking package-one package-two (debian detected)",
+				`4: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
+				`5: packages: command stdout:
 install ok installed	golang
 install ok installed	golang-1.16
 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",
+				"3: packages: installing package-one package-two",
+				`4: 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: packages: command output:\nfake stdout/stderr",
 			},
 			safcm.MsgSyncResp{
 				PackageChanges: []safcm.PackageChange{
@@ -272,16 +269,15 @@ install ok installed	golang-1.16-src
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: packages: detected debian",
-				`4: sync remote: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
-				`5: sync remote: packages: command stdout:
+				"4: packages: checking package-one package-two (debian detected)",
+				`4: packages: running "/usr/bin/dpkg-query" "--show" "--showformat=${Status}\\t${Package}\\n"`,
+				`5: packages: command stdout:
 install ok installed	golang
 install ok installed	golang-1.16
 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{