Two unit tests were failing. You won't believe how I fixed it!

syncany · Aug 15, 2014 · fa10785 · fa10785 · binwiederhier · Aug 15, 2014
1 parent 3ed505a
commit fa10785
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java b/syncany-lib/src/main/java/org/syncany/operations/cleanup/CleanupOperation.java
@@ -141,7 +141,12 @@ public CleanupOperationResult execute() throws Exception {
 
 		if (options.isRemoveOldVersions()) {
 			removeOldVersions();
-		}
+		} 
+
+		remoteTransaction.commit();
+		// Committing in two steps because a) at this point it is atomic b) such that
+		// the purge file can be accounted for when merging, if needed
+		remoteTransaction = new RemoteTransaction(config, transferManager);
 
 		if (options.isMergeRemoteFiles()) {
 			mergeRemoteFiles();

diff --git a/...y-lib/src/test/java/org/syncany/tests/plugins/unreliable_local/UploadInterruptedTest.java b/...y-lib/src/test/java/org/syncany/tests/plugins/unreliable_local/UploadInterruptedTest.java
@@ -44,7 +44,7 @@ public void testUnreliableUpload() throws Exception {
 				// Format: abs=<count> rel=<count> op=<connect|init|upload|...> <operation description>
 
 				// 1st upload (= multichunk) fails	
-				"rel=[345] .+upload.+multichunk", // << 3 retries!!
+				"rel=[456] .+upload.+multichunk", // << 3 retries!!
 
 				// Make fourth upload fail
 				"rel=(8|9|10) .+upload" // << 3 retries!!