Author: mreutegg
Date: Thu Feb 13 15:15:29 2014
New Revision: 1567950

URL: http://svn.apache.org/r1567950
Log:
OAK-1420: ConcurrentAddIT fails on buildbot

Enable test again.

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java?rev=1567950&r1=1567949&r2=1567950&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java
 Thu Feb 13 15:15:29 2014
@@ -79,8 +79,6 @@ public class ConcurrentAddIT extends Abs
     public void addNodesSameParent() throws Exception {
         // takes too long with RDBDocumentStore
         Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC);
-        // FIXME enable again once OAK-1420 is fixed
-        Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_NS);
         List<Exception> exceptions = Collections.synchronizedList(
                 new ArrayList<Exception>());
         // use nt:unstructured to force conflicts on :childOrder property


Reply via email to