svn commit: r1840574 - in /jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory: AbstractActiveDeletedBlobTest.java ActiveDeletedBlobSyncTrackerTest.java

[catholicon]

Author: catholicon
Date: Tue Sep 11 14:06:06 2018
New Revision: 1840574

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

This also fixes:
OAK-7205: Test failure: 
ActiveDeletedBlobSyncTrackerTest.syncActiveDeletionWithBlobTracker

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

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java?rev=1840574&r1=1840573&r2=1840574&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
 Tue Sep 11 14:06:06 2018
@@ -24,9 +24,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import com.google.common.collect.Iterators;
+import com.google.common.util.concurrent.MoreExecutors;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.core.data.DataIdentifier;
 import org.apache.jackrabbit.core.data.DataRecord;
@@ -69,7 +69,7 @@ public abstract class AbstractActiveDele
     @Rule
     public TemporaryFolder fileDataStoreRoot = new TemporaryFolder(new 
File("target"));
 
-    protected ExecutorService executorService = 
Executors.newFixedThreadPool(2);
+    protected ExecutorService executorService = 
MoreExecutors.sameThreadExecutor();
 
     protected CountingBlobStore blobStore = null;
 

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobSyncTrackerTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobSyncTrackerTest.java?rev=1840574&r1=1840573&r2=1840574&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobSyncTrackerTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobSyncTrackerTest.java
 Tue Sep 11 14:06:06 2018
@@ -103,7 +103,6 @@ public class ActiveDeletedBlobSyncTracke
     }
 
     // OAK-6504
-    @Ignore("OAK-7205")
     @Test
     public void syncActiveDeletionWithBlobTracker() throws Exception {
         createIndex("test1", of("propa"));