svn commit: r1672033 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentAddIT.java

[mreutegg]

Author: mreutegg
Date: Wed Apr  8 08:46:14 2015
New Revision: 1672033

URL: http://svn.apache.org/r1672033
Log:
OAK-2704: ConcurrentAddIT occasionally fail with OakMerge0001

Run with Parameterized as a possible fix

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=1672033&r1=1672032&r2=1672033&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
 Wed Apr  8 08:46:14 2015
@@ -32,11 +32,14 @@ import javax.jcr.Session;
 
 import com.google.common.collect.Iterators;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 /**
  * <code>ConcurrentAddIT</code> adds nodes with multiple sessions in separate
  * locations of the repository and under the same parent.
  */
+@RunWith(Parameterized.class) // OAK-2704
 public class ConcurrentAddIT extends AbstractRepositoryTest {
 
     private static final int NUM_WORKERS = 10;