X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Fsync%2Ffiles_test.go;h=57d27c7fa8e043b06543387a1a15a720fcdb0755;hb=b833e6d877e00290146fcd1e75a533664cf2dcb7;hp=5787404519936d519272a5050cebfec467ec64b1;hpb=116e5ebec76bbdf4f70ef4b5fc3ebb55cafee719;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm-remote/sync/files_test.go b/cmd/safcm-remote/sync/files_test.go
index 5787404..57d27c7 100644
--- a/cmd/safcm-remote/sync/files_test.go
+++ b/cmd/safcm-remote/sync/files_test.go
@@ -70,7 +70,7 @@ func TestSyncFiles(t *testing.T) {
 	}{
 
 		// 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)
 			},
@@ -920,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
 
@@ -2242,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",
 					},
 				},
 			},
@@ -2298,7 +2295,7 @@ file
 							Gid:   gid,
 						},
 						DataDiff: `@@ -1,2 +1,2 @@
--<binary content>
+-<binary content, 3 bytes>
 +content
  
 `,
@@ -2358,7 +2355,7 @@ file
 						},
 						DataDiff: `@@ -1,2 +1,2 @@
 -content
-+<binary content>
++<binary content, 4 bytes>
  
 `,
 					},