svn commit: r1839549 - /jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java

[mr...@apache.org]

Author: mreutegg
Date: Wed Aug 29 07:42:40 2018
New Revision: 1839549

URL: http://svn.apache.org/viewvc?rev=1839549&view=rev
Log:
OAK-6517: ActiveDeletedBlobCollectionIT.simpleAsyncIndexUpdateBasedBlobCollection failing intermittently

Create directory before repository is constructed

Modified:
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java?rev=1839549&r1=1839548&r2=1839549&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectionIT.java Wed Aug 29 07:42:40 2018
@@ -51,6 +51,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static com.google.common.collect.ImmutableSet.of;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
 @RunWith(Parameterized.class)
@@ -87,8 +88,9 @@ public class ActiveDeletedBlobCollection
 
     @Override
     protected ContentRepository createRepository() {
-        adbc = new ActiveDeletedBlobCollectorImpl(clock,
-                new File(blobCollectionRoot.getRoot(), "deleted-blobs"), executorService);
+        File deletedBlobsDir = new File(blobCollectionRoot.getRoot(), "deleted-blobs");
+        assertTrue(deletedBlobsDir.mkdirs());
+        adbc = new ActiveDeletedBlobCollectorImpl(clock, deletedBlobsDir, executorService);
 
         IndexCopier copier = createIndexCopier();
         editorProvider = new LuceneIndexEditorProvider(copier, null,
@@ -155,10 +157,10 @@ public class ActiveDeletedBlobCollection
         adbc.purgeBlobsDeleted(clock.getTimeIncreasing(), blobStore);
         long secondGCNumChunks = blobStore.numChunks;
 
-        Assert.assertTrue("First commit must create some chunks", firstCommitNumChunks > initialNumChunks);
-        Assert.assertTrue("First commit must create some chunks", secondCommitNumChunks > firstCommitNumChunks);
-        Assert.assertTrue("First GC should delete some chunks", firstGCNumChunks < secondCommitNumChunks);
-        Assert.assertTrue("Second GC should delete some chunks too", secondGCNumChunks < firstGCNumChunks);
+        assertTrue("First commit must create some chunks", firstCommitNumChunks > initialNumChunks);
+        assertTrue("First commit must create some chunks", secondCommitNumChunks > firstCommitNumChunks);
+        assertTrue("First GC should delete some chunks", firstGCNumChunks < secondCommitNumChunks);
+        assertTrue("Second GC should delete some chunks too", secondGCNumChunks < firstGCNumChunks);
     }
 
 }