sync: tests: check return value of setDefaults()

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

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index 635501195860b35b79333213d96f5aa6510ecf77..5787404519936d519272a5050cebfec467ec64b1 100644 (file)
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -58,15 +58,15 @@ func TestSyncFiles(t *testing.T) {
        tmpTestFilePath := "/tmp/safcm-sync-files-test-file"
 
        tests := []struct {
-               name     string
-               skip     bool
-               req      safcm.MsgSyncReq
-               prepare  func()
+               name        string
+               skip        bool
+               req         safcm.MsgSyncReq
+               prepare     func()
                expTriggers []string
-               expFiles []ft.File
-               expResp  safcm.MsgSyncResp
-               expDbg   []string
-               expErr   error
+               expFiles    []ft.File
+               expResp     safcm.MsgSyncResp
+               expDbg      []string
+               expErr      error
        }{
 
                // NOTE: Also update MsgSyncResp in safcm test cases when
@@ -834,7 +834,7 @@ func TestSyncFiles(t *testing.T) {
 
                        // Create separate test directory for each test case
                        path := filepath.Join(cwd, "testdata", "files-"+tc.name)
-                       err = os.Mkdir(path, 0700)
+                       err := os.Mkdir(path, 0700)
                        if err != nil {
                                t.Fatal(err)
                        }
@@ -850,9 +850,12 @@ func TestSyncFiles(t *testing.T) {
                        s, res := prepareSync(tc.req, &testRunner{
                                t: t,
                        })
-                       s.setDefaults()
+                       err = s.setDefaults()
+                       if err != nil {
+                               t.Fatal(err)
+                       }
 
-                       err := s.syncFiles()
+                       err = s.syncFiles()
                        testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                        dbg := res.Wait()
                        // Remove random file names from result
@@ -2374,7 +2377,7 @@ file
                t.Run(tc.name, func(t *testing.T) {
                        // Create separate test directory for each test case
                        path := filepath.Join(cwd, "testdata", "file-"+tc.name)
-                       err = os.Mkdir(path, 0700)
+                       err := os.Mkdir(path, 0700)
                        if err != nil {
                                t.Fatal(err)
                        }
@@ -2390,13 +2393,16 @@ file
                        s, res := prepareSync(tc.req, &testRunner{
                                t: t,
                        })
-                       s.setDefaults()
+                       err = s.setDefaults()
+                       if err != nil {
+                               t.Fatal(err)
+                       }
 
                        // Deterministic temporary symlink names
                        rand.Seed(0)
 
                        var changed bool
-                       err := s.syncFile(tc.file, &changed)
+                       err = s.syncFile(tc.file, &changed)
                        testutil.AssertErrorEqual(t, "err", err, tc.expErr)
                        dbg := res.Wait()
                        // Remove random file names from result