X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=3cf7e04358386909a237150536e50d7acf03416d;hb=edc7998408e700323fc7b6f8a9537ac16dfc6c13;hp=bd5eac9930c31b8978efe8060f491dd859b9d604;hpb=e4c6a178848145c8dba68ed054cbb48dcecccf65;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index bd5eac9..3cf7e04 100644
--- 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()
-		triggers []string
-		expFiles []ft.File
-		expResp  safcm.MsgSyncResp
-		expDbg   []string
-		expErr   error
+		name        string
+		skip        bool
+		req         safcm.MsgSyncReq
+		prepare     func()
+		expTriggers []string
+		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)
 			}
@@ -852,7 +852,7 @@ func TestSyncFiles(t *testing.T) {
 			})
 			s.setDefaults()
 
-			err := s.syncFiles()
+			err = s.syncFiles()
 			testutil.AssertErrorEqual(t, "err", err, tc.expErr)
 			dbg := res.Wait()
 			// Remove random file names from result
@@ -869,7 +869,7 @@ func TestSyncFiles(t *testing.T) {
 
 			testutil.AssertEqual(t, "resp", s.resp, tc.expResp)
 			testutil.AssertEqual(t, "triggers",
-				s.triggers, tc.triggers)
+				s.triggers, tc.expTriggers)
 		})
 	}
 
@@ -2374,7 +2374,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)
 			}
@@ -2396,7 +2396,7 @@ file
 			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