diff options
author | Philipp Haller <hallerp@gmail.com> | 2011-12-13 18:37:31 +0100 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2011-12-13 18:37:31 +0100 |
commit | 5a4b555c378d79d57b59dfd6edafd2b9a59866bb (patch) | |
tree | 018f363e28d33620eab72ac82d9e54a89dc799c2 | |
parent | 500f451ecef9d64814025b260ae1ab7adc541d75 (diff) | |
download | scala-5a4b555c378d79d57b59dfd6edafd2b9a59866bb.tar.gz scala-5a4b555c378d79d57b59dfd6edafd2b9a59866bb.tar.bz2 scala-5a4b555c378d79d57b59dfd6edafd2b9a59866bb.zip |
Make base TCK more uniform with Akka TCK
-rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala index 4261638e1f..ccf1162e19 100644 --- a/test/files/jvm/scala-concurrent-tck.scala +++ b/test/files/jvm/scala-concurrent-tck.scala @@ -12,6 +12,7 @@ import scala.concurrent.future import scala.concurrent.promise import scala.concurrent.await +import scala.util.Duration trait TestBase { @@ -320,7 +321,7 @@ trait Blocking extends TestBase { def testAwaitSuccess(): Unit = once { done => val f = future { 0 } - await(0, f) + await(Duration(500, "ms"), f) done() } @@ -331,7 +332,7 @@ trait Blocking extends TestBase { throw cause } try { - await(0, f) + await(Duration(500, "ms"), f) assert(false) } catch { case t => @@ -382,7 +383,7 @@ with FutureProjections with Promises with Exceptions { - + System.exit(0) } |