summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorViktor Klang <viktor.klang@gmail.com>2016-11-08 08:46:13 +0100
committerViktor Klang <viktor.klang@gmail.com>2016-11-08 08:46:13 +0100
commitc8e6b4e464b47bb2cd64afaf64c5249da4bbdf89 (patch)
treee81f05982a8126161290a01bbf9be09c8e40754e /test/files/jvm
parent10c609e750a7089055b126e6231e5ddb2f2e8623 (diff)
downloadscala-c8e6b4e464b47bb2cd64afaf64c5249da4bbdf89.tar.gz
scala-c8e6b4e464b47bb2cd64afaf64c5249da4bbdf89.tar.bz2
scala-c8e6b4e464b47bb2cd64afaf64c5249da4bbdf89.zip
Regression: Make Future.failed(e).failed turn into a success instead of failure
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/future-spec/FutureTests.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/future-spec/FutureTests.scala b/test/files/jvm/future-spec/FutureTests.scala
index d0de2f5542..a1934efdd0 100644
--- a/test/files/jvm/future-spec/FutureTests.scala
+++ b/test/files/jvm/future-spec/FutureTests.scala
@@ -123,7 +123,7 @@ class FutureTests extends MinimalScalaTest {
assert(f.mapTo[String] eq f, "Future.mapTo must be the same instance as Future.mapTo")
assert(f.zip(f) eq f, "Future.zip must be the same instance as Future.zip")
assert(f.flatten eq f, "Future.flatten must be the same instance as Future.flatten")
- assert(f.failed eq f, "Future.failed must be the same instance as Future.failed")
+ assert(f.failed.value == Some(Success(e)), "Future.failed.failed must become successful") // SI-10034
ECNotUsed(ec => f.foreach(_ => fail("foreach should not have been called"))(ec))
ECNotUsed(ec => f.onSuccess({ case _ => fail("onSuccess should not have been called") })(ec))