summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2015-04-01 16:52:54 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2015-04-01 16:52:54 +0200
commit3aea9219c40912f1fe501be67e1a630fd595a35d (patch)
treed6a5634dcaef14f982002fa088df1b5f7ef6b34d /test/files/jvm
parent51971954ace37ad6af8bf354d92f6baf51d16324 (diff)
parent32f520f3ed78ecde390dc7b1b48d3130e412a9dc (diff)
downloadscala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.gz
scala-3aea9219c40912f1fe501be67e1a630fd595a35d.tar.bz2
scala-3aea9219c40912f1fe501be67e1a630fd595a35d.zip
Merge commit '32f520f' into merge/2.11-to-2.12-apr-1
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/t8689.scala9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/files/jvm/t8689.scala b/test/files/jvm/t8689.scala
index ef43a1df63..3ee20d711a 100644
--- a/test/files/jvm/t8689.scala
+++ b/test/files/jvm/t8689.scala
@@ -4,10 +4,15 @@ object Test {
import ExecutionContext.Implicits.global
val source1 = Promise[Int]()
val source2 = Promise[Int]()
+ val done = Promise[Unit]()
source2.completeWith(source1.future).future.onComplete {
- case _ => print("success")
+ case _ =>
+ print("success")
+ done.success(())
}
source2.tryFailure(new TimeoutException)
source1.success(123)
+ import duration._
+ Await.result(done.future, 120.seconds)
}
-} \ No newline at end of file
+}