X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fservices_systemd_test.go;h=5aa36cd7bc38019eac8d947d374876cf05bf4f7b;hb=8a3f6af248e28ea7efc1bf89751a597d28834942;hp=f4f7f4920c6c61ae703956c65b6069268fb87f4e;hpb=778665c07c9cf6f434dbd1ee867fe8b8636f55c0;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/services_systemd_test.go b/cmd/safcm-remote/sync/services_systemd_test.go
index f4f7f49..5aa36cd 100644
--- a/cmd/safcm-remote/sync/services_systemd_test.go
+++ b/cmd/safcm-remote/sync/services_systemd_test.go
@@ -39,7 +39,7 @@ func TestSyncServicesSystemd(t *testing.T) {
 	}{
 
 		// NOTE: Also update MsgSyncResp in safcm test cases when
-		// changing anything here!
+		// changing the MsgSyncResp struct!
 
 		{
 			"no service change necessary",
@@ -75,10 +75,9 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two",
-				`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=
@@ -126,10 +125,9 @@ LoadError= ""
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two",
-				`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= ""
@@ -177,10 +175,9 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-does-not-exist service-two",
-				`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."
@@ -272,10 +269,9 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two service-three",
-				`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=
@@ -288,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{
@@ -356,10 +352,9 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two service-three",
-				`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=
@@ -462,10 +457,9 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two service-three",
-				`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=
@@ -478,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{