You are viewing a plain text version of this content. The canonical link for it is here.

Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/01/18 09:42:59 UTC

svn commit: r1725189 - /jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java

Author: mreutegg
Date: Mon Jan 18 08:42:59 2016
New Revision: 1725189

URL: http://svn.apache.org/viewvc?rev=1725189&view=rev
Log:
OAK-3882: Collision may mark the wrong commit

Enable test

Modified:
    jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java

Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java?rev=1725189&r1=1725188&r2=1725189&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionWithSplitTest.java Mon Jan 18 08:42:59 2016
@@ -29,7 +29,6 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
@@ -64,7 +63,6 @@ public class CollisionWithSplitTest exte
         ns2.dispose();
     }
 
-    @Ignore("OAK-3882")
     @Test
     public void collisionAfterSplit() throws Exception {
         final int NUM_NODES = 10;