Author: mduerig
Date: Thu Feb 13 09:24:23 2014
New Revision: 1567868
URL: http://svn.apache.org/r1567868
Log:
OAK-1420: ConcurrentAddIT fails on buildbot
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=1567868&r1=1567867&r2=1567868&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
Thu Feb 13 09:24:23 2014
@@ -16,6 +16,10 @@
*/
package org.apache.jackrabbit.oak.jcr;
+import static org.apache.jackrabbit.commons.JcrUtils.in;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -26,15 +30,10 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import com.google.common.collect.Iterators;
import org.junit.Assume;
import org.junit.Test;
-import com.google.common.collect.Iterators;
-
-import static org.apache.jackrabbit.commons.JcrUtils.in;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
/**
* <code>ConcurrentAddIT</code> adds nodes with multiple sessions in separate
* locations of the repository and under the same parent.
@@ -83,7 +82,8 @@ public class ConcurrentAddIT extends Abs
List<Exception> exceptions = Collections.synchronizedList(
new ArrayList<Exception>());
// use nt:unstructured to force conflicts on :childOrder property
- Node test = getAdminSession().getRootNode().addNode("test",
"nt:unstructured");
+ // FIXME OAK-1420 revert to nt:unstructured
+ Node test = getAdminSession().getRootNode().addNode("test",
"oak:Unstructured");
List<Thread> worker = new ArrayList<Thread>();
for (int i = 0; i < NUM_WORKERS; i++) {
worker.add(new Thread(new Worker(
