X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Fservices_systemd_test.go;h=cf0f4ab1de543c99738873fbcf4c11747bfaffa2;hb=4e46a22dc5165611b254081597c65969c8c2ce39;hp=0460bb73c771ed6046c95097742a188f9186d64d;hpb=3473766d8afb07cb0685694656947883cbbd1138;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 0460bb7..cf0f4ab 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,8 +75,7 @@ LoadError=
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two",
+				"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:
 ActiveState=active
@@ -126,8 +125,7 @@ LoadError= ""
 				Stderr: &bytes.Buffer{},
 			}},
 			[]string{
-				"4: sync remote: services: detected systemd",
-				"4: sync remote: services: checking service-one service-two",
+				"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:
 ActiveState=active
@@ -177,8 +175,7 @@ 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: 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:
 ActiveState=inactive
@@ -224,7 +221,7 @@ LoadError=
 				nil,
 				nil,
 				nil,
-				[]byte(`fake stderr`),
+				[]byte("fake stderr"),
 			},
 			[]error{nil, nil, nil, nil},
 			[]*exec.Cmd{&exec.Cmd{
@@ -272,8 +269,7 @@ 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: 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:
 ActiveState=inactive
@@ -356,8 +352,7 @@ 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: 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:
 ActiveState=inactive
@@ -421,7 +416,7 @@ LoadError=
 			[][]byte{
 				nil,
 				nil,
-				[]byte(`fake stderr`),
+				[]byte("fake stderr"),
 			},
 			[]error{
 				nil,
@@ -462,8 +457,7 @@ 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: 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:
 ActiveState=inactive