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

[mreutegg]

Author: mreutegg
Date: Thu Jun 22 11:37:26 2017
New Revision: 1799565

URL: http://svn.apache.org/viewvc?rev=1799565&view=rev
Log:
OAK-6383: Changes visible before merge

Add ignored test

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?rev=1799565&r1=1799564&r2=1799565&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
 Thu Jun 22 11:37:26 2017
@@ -3115,6 +3115,27 @@ public class DocumentNodeStoreTest {
         assertTrue(names.contains("a"));
     }
 
+    // OAK-6383
+    @Ignore("OAK-6383")
+    @Test
+    public void disableBranches() throws Exception {
+        Clock clock = new Clock.Virtual();
+        clock.waitUntil(System.currentTimeMillis());
+        Revision.setClock(clock);
+        DocumentNodeStore ns = builderProvider.newBuilder().disableBranches()
+                .setUpdateLimit(100).clock(clock)
+                .setAsyncDelay(0).getNodeStore();
+        RevisionVector head = ns.getHeadRevision();
+        NodeBuilder b = ns.getRoot().builder();
+        for (int i = 0; i < 100; i++) {
+            b.child("node-" + i).setProperty("p", "v");
+        }
+        assertEquals(head, ns.getHeadRevision());
+        clock.waitUntil(clock.getTime() + TimeUnit.MINUTES.toMillis(5));
+        ns.runBackgroundOperations();
+        assertEquals(head, ns.getHeadRevision());
+    }
+
     private static class WriteCountingStore extends MemoryDocumentStore {
         private final ThreadLocal<Boolean> createMulti = new ThreadLocal<>();
         int count;