Author: reschke
Date: Fri Dec 11 09:08:50 2015
New Revision: 1719288
URL: http://svn.apache.org/viewvc?rev=1719288&view=rev
Log:
OAK-3765: Parallelized test runner does not wait for test completion
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/Parallelized.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/Parallelized.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/Parallelized.java?rev=1719288&r1=1719287&r2=1719288&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/Parallelized.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/Parallelized.java
Fri Dec 11 09:08:50 2015
@@ -32,11 +32,10 @@ import org.slf4j.LoggerFactory;
public class Parallelized extends Parameterized {
/**
- * Logger instance. Unused by this class, but present to force early
- * auto-initialization of the logging system and thus to avoid warnings
- * about concurrent initialization.
+ * Logger instance. Present to force early auto-initialization of the
+ * logging system and thus to avoid warnings about concurrent
+ * initialization.
*/
- @SuppressWarnings("unused")
private static final Logger log =
LoggerFactory.getLogger(Parallelized.class);
@@ -53,7 +52,9 @@ public class Parallelized extends Parame
public void finished() {
executor.shutdown();
try {
- executor.awaitTermination(10, TimeUnit.MINUTES);
+ while (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
+ log.info("Awaiting for the task termination in {}",
executor);
+ }
} catch (InterruptedException exc) {
throw new RuntimeException(exc);
}