svn commit: r1501780 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java

[mreutegg]

Author: mreutegg
Date: Wed Jul 10 14:45:23 2013
New Revision: 1501780

URL: http://svn.apache.org/r1501780
Log:
OAK-893: MongoMK may fail with MicroKernelException under concurrent commits
- yet another simplified test

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java?rev=1501780&r1=1501779&r2=1501780&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/mongomk/MongoMKRebaseTest.java
 Wed Jul 10 14:45:23 2013
@@ -181,6 +181,22 @@ public class MongoMKRebaseTest extends B
     }
 
     @Test
+    @Ignore("OAK-893")
+    public void phantomRead() {
+        String base = mk.commit("/", "+\"test\":{}", null, null);
+        String branchRev1 = mk.branch(base);
+        String branchRev2 = mk.branch(base);
+        branchRev1 = mk.commit("/test", "+\"node1\":{}", branchRev1, null);
+        branchRev2 = mk.commit("/test", "+\"node2\":{}", branchRev2, null);
+        String r = mk.commit("/test", "+\"node3\":{}", null, null);
+        branchRev1 = mk.rebase(branchRev1, r);
+        mk.merge(branchRev2, null);
+
+        assertNodesExist(branchRev1, "/test/node1", "/test/node3");
+        assertNodesNotExist(branchRev1, "/test/node2");
+    }
+
+    @Test
     @Ignore("Conflict handling")
     public void rebaseAddExistingNode() {
         mk.commit("", "+\"/x\":{}", null, null);