X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=57d27c7fa8e043b06543387a1a15a720fcdb0755;hb=b833e6d877e00290146fcd1e75a533664cf2dcb7;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..57d27c7 100644
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -58,19 +58,19 @@ 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
-		// changing anything here!
+		// changing the MsgSyncResp struct!
 
 		// See TestSyncFile() for most file related tests. This
 		// function only tests the overall results and triggers.
@@ -415,10 +415,7 @@ func TestSyncFiles(t *testing.T) {
 				},
 			},
 			func() {
-				err = os.Chmod(".", 0750)
-				if err != nil {
-					panic(err)
-				}
+				ft.CreateDirectoryExists(".", 0750)
 				ft.CreateDirectory("dir", 0755)
 				ft.CreateFile("dir/file", "content\n", 0644)
 			},
@@ -834,7 +831,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 +847,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
@@ -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)
 		})
 	}
 
@@ -917,7 +917,7 @@ func TestSyncFile(t *testing.T) {
 	}{
 
 		// NOTE: Also update MsgSyncResp in safcm test cases when
-		// changing anything here!
+		// changing the MsgSyncResp struct!
 
 		// TODO: Add tests for chown and run them only as root
 
@@ -2239,7 +2239,7 @@ file
 							Group: group,
 							Gid:   gid,
 						},
-						DataDiff: "Binary files differ, cannot show diff",
+						DataDiff: "Binary files differ (3 -> 4 bytes), cannot show diff",
 					},
 				},
 			},
@@ -2295,7 +2295,7 @@ file
 							Gid:   gid,
 						},
 						DataDiff: `@@ -1,2 +1,2 @@
--<binary content>
+-<binary content, 3 bytes>
 +content
  
 `,
@@ -2355,7 +2355,7 @@ file
 						},
 						DataDiff: `@@ -1,2 +1,2 @@
 -content
-+<binary content>
++<binary content, 4 bytes>
  
 `,
 					},
@@ -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)
 			}
@@ -2390,13 +2390,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