svn commit: r1740767 - in /jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document: BulkCreateOrUpdateClusterTest.java BulkCreateOrUpdateTest.java

[tomekr]

Author: tomekr
Date: Mon Apr 25 07:37:43 2016
New Revision: 1740767

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

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

Modified: 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1740767&r1=1740766&r2=1740767&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
 Mon Apr 25 07:37:43 2016
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNot
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -127,6 +128,8 @@ public class BulkCreateOrUpdateClusterTe
      */
     @Test
     public void testConcurrentWithConflict() throws InterruptedException {
+        assumeTrue(this.dsf != DocumentStoreFixture.RDB_DERBY);
+
         int threadCount = 10;
         int amount = 500;
 

Modified: 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java?rev=1740767&r1=1740766&r2=1740767&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
 Mon Apr 25 07:37:43 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;