Author: mreutegg
Date: Tue Nov 17 08:14:48 2015
New Revision: 1714730
URL: http://svn.apache.org/viewvc?rev=1714730&view=rev
Log:
OAK-3643: ConflictResolutionTest fails occasionally
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java?rev=1714730&r1=1714729&r2=1714730&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConflictResolutionTest.java
Tue Nov 17 08:14:48 2015
@@ -32,11 +32,14 @@ import javax.jcr.Session;
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
import org.junit.After;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import ch.qos.logback.classic.Level;
import com.google.common.collect.Sets;
+@RunWith(Parameterized.class)
public class ConflictResolutionTest extends AbstractRepositoryTest {
// TODO add tests for all ConflictType types to observe generated logs
