Author: thomasm
Date: Wed Feb 22 10:20:39 2017
New Revision: 1784007
URL: http://svn.apache.org/viewvc?rev=1784007&view=rev
Log:
OAK-5624 Test failure:
org.apache.jackrabbit.oak.cache.ConcurrentTest.testLoaderBlock
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentTest.java
Modified:
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentTest.java?rev=1784007&r1=1784006&r2=1784007&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentTest.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/ConcurrentTest.java
Wed Feb 22 10:20:39 2017
@@ -87,8 +87,8 @@ public class ConcurrentTest {
Thread.sleep(1000);
stop.set(true);
for (Thread t : threads) {
- t.join(1000);
- // if the thread is still alive after 1 second, we assume
+ t.join(30000);
+ // if the thread is still alive after 30 seconds, we assume
// there is a deadlock - we just let the threads alive,
// but report a failure (what else could we do?)
if (t.isAlive()) {
@@ -99,7 +99,7 @@ public class ConcurrentTest {
throw ex[0];
}
long add = additionalWait.get();
- assertTrue("Had to wait unexpectedly long for other threads: " + add,
add < 1000);
+ assertTrue("Had to wait unexpectedly long for other threads: " + add,
add < 30000);
}
@Test
