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

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

diff --git a/cmd/safcm-remote/sync/services_systemd_test.go b/cmd/safcm-remote/sync/services_systemd_test.go
index cf0f4ab1de543c99738873fbcf4c11747bfaffa2..5aa36cd7bc38019eac8d947d374876cf05bf4f7b 100644 (file)
--- a/cmd/safcm-remote/sync/services_systemd_test.go
+++ b/cmd/safcm-remote/sync/services_systemd_test.go
@@ -75,9 +75,9 @@ LoadError=
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-one service-two (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-one service-two (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two"`,
+                               `5: services: command stdout:
 ActiveState=active
 UnitFileState=enabled
 LoadError=
@@ -125,9 +125,9 @@ LoadError= ""
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-one service-two (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-one service-two (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two"`,
+                               `5: services: command stdout:
 ActiveState=active
 UnitFileState=enabled
 LoadError= ""
@@ -175,9 +175,9 @@ LoadError=
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-does-not-exist service-two (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-does-not-exist" "service-two"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-does-not-exist service-two (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-does-not-exist" "service-two"`,
+                               `5: services: command stdout:
 ActiveState=inactive
 UnitFileState=
 LoadError=org.freedesktop.systemd1.NoSuchUnit "Unit service-does-not-exist.service not found."
@@ -269,9 +269,9 @@ LoadError=
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-one service-two service-three (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-one service-two service-three (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
+                               `5: services: command stdout:
 ActiveState=inactive
 UnitFileState=enabled
 LoadError=
@@ -284,12 +284,12 @@ ActiveState=failed
 UnitFileState=disabled
 LoadError=
 `,
-                               `4: sync remote: services: running "/bin/systemctl" "daemon-reload"`,
-                               "3: sync remote: services: starting service-one service-three",
-                               `4: sync remote: services: running "/bin/systemctl" "start" "--" "service-one" "service-three"`,
-                               "3: sync remote: services: enabling service-two service-three",
-                               `4: sync remote: services: running "/bin/systemctl" "enable" "--" "service-two" "service-three"`,
-                               "5: sync remote: services: command stderr:\nfake stderr",
+                               `4: services: running "/bin/systemctl" "daemon-reload"`,
+                               "3: services: starting service-one service-three",
+                               `4: services: running "/bin/systemctl" "start" "--" "service-one" "service-three"`,
+                               "3: services: enabling service-two service-three",
+                               `4: services: running "/bin/systemctl" "enable" "--" "service-two" "service-three"`,
+                               "5: services: command stderr:\nfake stderr",
                        },
                        safcm.MsgSyncResp{
                                ServiceChanges: []safcm.ServiceChange{
@@ -352,9 +352,9 @@ LoadError=
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-one service-two service-three (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-one service-two service-three (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
+                               `5: services: command stdout:
 ActiveState=inactive
 UnitFileState=enabled
 LoadError=
@@ -457,9 +457,9 @@ LoadError=
                                Stderr: &bytes.Buffer{},
                        }},
                        []string{
-                               "4: sync remote: services: checking service-one service-two service-three (systemd detected)",
-                               `4: sync remote: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
-                               `5: sync remote: services: command stdout:
+                               "4: services: checking service-one service-two service-three (systemd detected)",
+                               `4: services: running "/bin/systemctl" "show" "--property=ActiveState,UnitFileState,LoadError" "--" "service-one" "service-two" "service-three"`,
+                               `5: services: command stdout:
 ActiveState=inactive
 UnitFileState=enabled
 LoadError=
@@ -472,10 +472,10 @@ ActiveState=failed
 UnitFileState=disabled
 LoadError=
 `,
-                               `4: sync remote: services: running "/bin/systemctl" "daemon-reload"`,
-                               "3: sync remote: services: starting service-one service-three",
-                               `4: sync remote: services: running "/bin/systemctl" "start" "--" "service-one" "service-three"`,
-                               "5: sync remote: services: command stderr:\nfake stderr",
+                               `4: services: running "/bin/systemctl" "daemon-reload"`,
+                               "3: services: starting service-one service-three",
+                               `4: services: running "/bin/systemctl" "start" "--" "service-one" "service-three"`,
+                               "5: services: command stderr:\nfake stderr",
                        },
                        safcm.MsgSyncResp{
                                ServiceChanges: []safcm.ServiceChange{