From 2a36246342c17044bf5aafbf71fe1f2147ffe60a Mon Sep 17 00:00:00 2001 From: phaller Date: Thu, 17 May 2012 00:20:45 +0200 Subject: SIP-14: clean ups and fixes --- test/files/jvm/future-spec/FutureTests.scala | 2 +- test/files/jvm/future-spec/PromiseTests.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/files/jvm/future-spec') diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala index 9a9cf951bb..e5e01a5954 100644 --- a/test/files/jvm/future-spec/FutureTests.scala +++ b/test/files/jvm/future-spec/FutureTests.scala @@ -19,7 +19,7 @@ object FutureTests extends MinimalScalaTest { case "NoReply" => Promise[String]().future } - val defaultTimeout = Inf + val defaultTimeout = 5 seconds /* future specification */ diff --git a/test/files/jvm/future-spec/PromiseTests.scala b/test/files/jvm/future-spec/PromiseTests.scala index 6016746a23..bf9d9b39d7 100644 --- a/test/files/jvm/future-spec/PromiseTests.scala +++ b/test/files/jvm/future-spec/PromiseTests.scala @@ -133,7 +133,7 @@ object PromiseTests extends MinimalScalaTest { (future, result) => intercept[NoSuchElementException] { Await.result(future.failed, defaultTimeout) - }.getMessage mustBe ("Future.failed not completed with a throwable. Instead completed with: " + result) + }.getMessage mustBe ("Future.failed not completed with a throwable.") } } -- cgit v1.2.3