diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 08:33:29 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 08:33:29 -0700 |
| commit | 019f0c6d81b6979754563ecbf62a846c99823110 (patch) | |
| tree | 2c9170d10374c1af812fa6f069f50ebc24c06622 /src | |
| parent | fcf0776539d2aed3b6808f7a710e757f35621db4 (diff) | |
| parent | 4d7069c7114b638c51b5b76cde467e6725294650 (diff) | |
| download | scala-019f0c6d81b6979754563ecbf62a846c99823110.tar.gz scala-019f0c6d81b6979754563ecbf62a846c99823110.tar.bz2 scala-019f0c6d81b6979754563ecbf62a846c99823110.zip | |
Merge pull request #934 from paulp/partest-timeout
Increase partest timeout and emit warning when it hits.
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 2bb373d9c5..6c239721c3 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -59,7 +59,8 @@ trait DirectRunner { val futures = kindFiles map (f => (f, pool submit callable(manager runTest f))) toMap pool.shutdown() - pool.awaitTermination(1, TimeUnit.HOURS) + if (!pool.awaitTermination(4, TimeUnit.HOURS)) + NestUI.warning("Thread pool timeout elapsed before all tests were complete!") for ((file, future) <- futures) yield { val state = if (future.isCancelled) TestState.Timeout else future.get |