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

[tomekr]

Author: tomekr
Date: Fri Apr 22 09:06:28 2016
New Revision: 1740471

URL: http://svn.apache.org/viewvc?rev=1740471&view=rev
Log:
OAK-4273: Disable testConcurrentWithConflict on Derby

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

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java?rev=1740471&r1=1740470&r2=1740471&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 Fri Apr 22 09:06:28 2016
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -251,6 +252,8 @@ public class BulkCreateOrUpdateTest exte
      */
     @Test
     public void testConcurrentWithConflict() throws InterruptedException {
+        assumeTrue(this.dsf != DocumentStoreFixture.RDB_DERBY);
+
         int threadCount = 10;
         int amount = 500;