sync: tests: use "..." instead of `...` for regular strings

[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 df226fc85e00fae40dc06834e25deae3a1bce5e5..f4f7f4920c6c61ae703956c65b6069268fb87f4e 100644 (file)
--- a/cmd/safcm-remote/sync/services_systemd_test.go
+++ b/cmd/safcm-remote/sync/services_systemd_test.go
@@ -19,12 +19,10 @@ import (
        "bytes"
        "fmt"
        "os/exec"
-       "reflect"
        "testing"
 
-       "github.com/google/go-cmp/cmp"
-
        "ruderich.org/simon/safcm"
+       "ruderich.org/simon/safcm/testutil"
 )
 
 func TestSyncServicesSystemd(t *testing.T) {
@@ -226,7 +224,7 @@ LoadError=
                                nil,
                                nil,
                                nil,
-                               []byte(`fake stderr`),
+                               []byte("fake stderr"),
                        },
                        []error{nil, nil, nil, nil},
                        []*exec.Cmd{&exec.Cmd{
@@ -423,7 +421,7 @@ LoadError=
                        [][]byte{
                                nil,
                                nil,
-                               []byte(`fake stderr`),
+                               []byte("fake stderr"),
                        },
                        []error{
                                nil,
@@ -508,30 +506,20 @@ LoadError=
 
        for _, tc := range tests {
                t.Run(tc.name, func(t *testing.T) {
-               s, res := prepareSync(tc.req, &testRunner{
-                       t:         t,
-                       expCmds:   tc.expCmds,
-                       resStdout: tc.stdout,
-                       resStderr: tc.stderr,
-                       resError:  tc.errors,
-               })
-
-               err := s.syncServicesSystemd()
-               // Ugly but the simplest way to compare errors (including nil)
-               if fmt.Sprintf("%s", err) != fmt.Sprintf("%s", tc.expErr) {
-                       t.Errorf("err = %#v, want %#v",
-                               err, tc.expErr)
-               }
-               dbg := res.Wait()
-
-               if !reflect.DeepEqual(tc.expResp, s.resp) {
-                       t.Errorf("resp: %s",
-                               cmp.Diff(tc.expResp, s.resp))
-               }
-               if !reflect.DeepEqual(tc.expDbg, dbg) {
-                       t.Errorf("dbg: %s",
-                               cmp.Diff(tc.expDbg, dbg))
-               }
+                       s, res := prepareSync(tc.req, &testRunner{
+                               t:         t,
+                               expCmds:   tc.expCmds,
+                               resStdout: tc.stdout,
+                               resStderr: tc.stderr,
+                               resError:  tc.errors,
+                       })
+
+                       err := s.syncServicesSystemd()
+                       testutil.AssertErrorEqual(t, "err", err, tc.expErr)
+                       dbg := res.Wait()
+
+                       testutil.AssertEqual(t, "resp", s.resp, tc.expResp)
+                       testutil.AssertEqual(t, "dbg", dbg, tc.expDbg)
                })
        }
 }