diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 11:01:49 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-06 11:01:49 +0100 |
commit | e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27 (patch) | |
tree | 1431c30261e51949510d3c6b7bddffc9cb393ff4 /test/files/jvm | |
parent | 2c4ed0b25042cc19dddd7585e9afd9ea78d2d86f (diff) | |
parent | 7d748846901feb098b9e3f46dd96d93201495a20 (diff) | |
download | scala-e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27.tar.gz scala-e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27.tar.bz2 scala-e0c2c14cd80fffa3f8af0836e55a5b8ca8c53d27.zip |
Merge commit '7d74884' into merge-2.10.x-to-master
Conflicts:
test/files/jvm/scala-concurrent-tck.scala
Diffstat (limited to 'test/files/jvm')
-rw-r--r-- | test/files/jvm/future-spec/PromiseTests.scala | 4 | ||||
-rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/jvm/future-spec/PromiseTests.scala b/test/files/jvm/future-spec/PromiseTests.scala index 49350586b8..12b9168c5d 100644 --- a/test/files/jvm/future-spec/PromiseTests.scala +++ b/test/files/jvm/future-spec/PromiseTests.scala @@ -38,10 +38,10 @@ class PromiseTests extends MinimalScalaTest { Await.result(failure fallbackTo timedOut, defaultTimeout) mustBe ("Timedout") Await.result(timedOut fallbackTo empty, defaultTimeout) mustBe ("Timedout") - Await.result(failure fallbackTo failure fallbackTo timedOut, defaultTimeout) mustBe ("Timedout") + Await.result(otherFailure fallbackTo failure fallbackTo timedOut, defaultTimeout) mustBe ("Timedout") intercept[RuntimeException] { Await.result(failure fallbackTo otherFailure, defaultTimeout) - }.getMessage mustBe ("last") + }.getMessage mustBe ("br0ken") } } diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index b431f6b8f8..ce86d4aef0 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -344,8 +344,8 @@ def testTransformFailure(): Unit = once { def testFallbackToFailure(): Unit = once { done => val cause = new Exception - val f = Future { sys.error("failed") } - val g = Future { throw cause } + val f = Future { throw cause } + val g = Future { sys.error("failed") } val h = f fallbackTo g h onSuccess { case _ => done(false) } |