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 to...@apache.org on 2016/04/25 09:34:54 UTC
svn commit: r1740766 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Author: tomekr
Date: Mon Apr 25 07:34:54 2016
New Revision: 1740766
URL: http://svn.apache.org/viewvc?rev=1740766&view=rev
Log:
OAK-4273: Disable testConcurrentWithConflict on Derby
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java?rev=1740766&r1=1740765&r2=1740766&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateClusterTest.java Mon Apr 25 07:34:54 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;