diff options
| author | Paul Phillips <paulp@improving.org> | 2012-07-19 07:26:54 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-07-19 07:28:17 -0700 |
| commit | a40a90fc33b6ba6fbc042cbf2f69f46a66417e2f (patch) | |
| tree | 5dfb5e7a04ddb940e9ca341f47f1877702385eca /src | |
| parent | e75e862006b78d1a159c4ffb6194340492bd2de5 (diff) | |
| download | scala-a40a90fc33b6ba6fbc042cbf2f69f46a66417e2f.tar.gz scala-a40a90fc33b6ba6fbc042cbf2f69f46a66417e2f.tar.bz2 scala-a40a90fc33b6ba6fbc042cbf2f69f46a66417e2f.zip | |
Shield from InterruptedException in partest.
Sorry, I'm not in practice with java.util.concurrent.
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 6c239721c3..86c790f9dd 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -59,8 +59,11 @@ trait DirectRunner { val futures = kindFiles map (f => (f, pool submit callable(manager runTest f))) toMap pool.shutdown() - if (!pool.awaitTermination(4, TimeUnit.HOURS)) + try if (!pool.awaitTermination(4, TimeUnit.HOURS)) NestUI.warning("Thread pool timeout elapsed before all tests were complete!") + catch { case _: InterruptedException => + NestUI.warning("Thread pool was interrupted") + } for ((file, future) <- futures) yield { val state = if (future.isCancelled) TestState.Timeout else future.get |