svn commit: r1809839 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

[mreutegg]

Author: mreutegg
Date: Wed Sep 27 12:32:14 2017
New Revision: 1809839

URL: http://svn.apache.org/viewvc?rev=1809839&view=rev
Log:
OAK-6680: Test failure: 
DocumentNodeStoreTest.disabledBranchesWithBackgroundWrite

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1809839&r1=1809838&r2=1809839&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 Wed Sep 27 12:32:14 2017
@@ -3146,7 +3146,6 @@ public class DocumentNodeStoreTest {
 
     // OAK-6392
     @Test
-    @Ignore("OAK-6680")
     public void disabledBranchesWithBackgroundWrite() throws Exception {
         final Thread current = Thread.currentThread();
         final Set<Integer> updates = Sets.newHashSet();
@@ -3185,12 +3184,18 @@ public class DocumentNodeStoreTest {
         });
         bgThread.start();
 
-        for (int j = 0; j < 20; j++) {
+        // perform up to 200 merges
+        for (int j = 0; j < 200; j++) {
             builder = ns.getRoot().builder();
             for (int i = 0; i < 30; i++) {
                 builder.child("node-" + i).child("test").setProperty("p", j);
             }
             merge(ns, builder);
+
+            // break out after 20 when there are updates
+            if (j > 20 && !updates.isEmpty()) {
+                break;
+            }
         }
         running.set(false);
         bgThread.join();