diff options
| author | Paul Phillips <paulp@improving.org> | 2012-07-17 10:36:22 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-07-17 10:38:33 -0700 |
| commit | 4d7069c7114b638c51b5b76cde467e6725294650 (patch) | |
| tree | 4683ef514e1e7a725cb31f6f60117f1125e699b5 /src | |
| parent | 0cfd858a38ddf0ac83d9bbefe85110f88dc707c0 (diff) | |
| download | scala-4d7069c7114b638c51b5b76cde467e6725294650.tar.gz scala-4d7069c7114b638c51b5b76cde467e6725294650.tar.bz2 scala-4d7069c7114b638c51b5b76cde467e6725294650.zip | |
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 |