sync: shorten log messages by removing "info/sync remote:" prefix

[safcm/safcm.git] / cmd / safcm-remote / sync / packages_debian_test.go

diff --git a/cmd/safcm-remote/sync/packages_debian_test.go b/cmd/safcm-remote/sync/packages_debian_test.go
index a51a6a9d3f319abc966fbcec473a2c4e3a103d0d..97b8c6182d3f6a9727c05a680bb034ddabb04fff 100644 (file)
--- a/cmd/safcm-remote/sync/packages_debian_test.go
+++ b/cmd/safcm-remote/sync/packages_debian_test.go
@@ -73,9 +73,9 @@ install ok installed  package-two
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "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:
+                               "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
@@ -137,9 +137,9 @@ install ok installed        package-two
                                ),
                        }},
                        []string{
-                               "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:
+                               "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
@@ -147,9 +147,9 @@ install ok installed        golang-1.16-go
 install ok installed   golang-1.16-src
 install ok installed   package-two
 `,
-                               "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{
@@ -213,18 +213,18 @@ install ok installed      golang-1.16-src
                                ),
                        }},
                        []string{
-                               "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:
+                               "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
 `,
-                               "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{
@@ -269,9 +269,9 @@ install ok installed        golang-1.16-src
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "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:
+                               "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