svn commit: r1757624 - /jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java

[frm]

Author: frm
Date: Thu Aug 25 08:01:34 2016
New Revision: 1757624

URL: http://svn.apache.org/viewvc?rev=1757624&view=rev
Log:
OAK-4699 - Wait for the workers to complete before triggering cleanup

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java?rev=1757624&r1=1757623&r2=1757624&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactionAndCleanupIT.java
 Thu Aug 25 08:01:34 2016
@@ -975,12 +975,12 @@ public class CompactionAndCleanupIT {
                 results.add(executorService.submit(concurrentWriteTask));
             }
 
-            fileStore.cleanup();
-
             for (Future<?> result : results) {
                 assertNull(result.get());
             }
 
+            fileStore.cleanup();
+
             for (String fileName : fileStoreFolder.list()) {
                 if (fileName.endsWith(".tar")) {
                     int pos = fileName.length() - "a.tar".length();