diff options
| author | phaller <hallerp@gmail.com> | 2012-05-17 00:20:45 +0200 |
|---|---|---|
| committer | phaller <hallerp@gmail.com> | 2012-05-17 00:20:45 +0200 |
| commit | 2a36246342c17044bf5aafbf71fe1f2147ffe60a (patch) | |
| tree | 68ae9d33231ffc7d3699e9ac51d6c2a759bc73c8 /test/files/jvm/future-spec | |
| parent | 9fe251e16b93d4bdc8a496f3edce90ef2e207ee8 (diff) | |
| download | scala-2a36246342c17044bf5aafbf71fe1f2147ffe60a.tar.gz scala-2a36246342c17044bf5aafbf71fe1f2147ffe60a.tar.bz2 scala-2a36246342c17044bf5aafbf71fe1f2147ffe60a.zip | |
SIP-14: clean ups and fixes
Diffstat (limited to 'test/files/jvm/future-spec')
| -rw-r--r-- | test/files/jvm/future-spec/FutureTests.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/future-spec/PromiseTests.scala | 2 |
2 files changed, 2 insertions, 2 deletions
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.") } } |