summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2012-02-19 14:54:09 +0100
committerPhilipp Haller <hallerp@gmail.com>2012-02-19 14:54:09 +0100
commit91dcdbd377b02f36b26420e2862eb597f5698c6d (patch)
treed29d0f214879e51f69df5594411455dba1b57e96
parentab84c8d9a97b41728e77f7808eda2748d052ca06 (diff)
downloadscala-91dcdbd377b02f36b26420e2862eb597f5698c6d.tar.gz
scala-91dcdbd377b02f36b26420e2862eb597f5698c6d.tar.bz2
scala-91dcdbd377b02f36b26420e2862eb597f5698c6d.zip
Fix race condition in scala-concurrent-tck test
-rw-r--r--test/files/jvm/scala-concurrent-tck.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/scala-concurrent-tck.scala b/test/files/jvm/scala-concurrent-tck.scala
index 244ff02da7..ba7dffbcb0 100644
--- a/test/files/jvm/scala-concurrent-tck.scala
+++ b/test/files/jvm/scala-concurrent-tck.scala
@@ -321,7 +321,7 @@ trait FutureProjections extends TestBase {
done =>
val f = future { 0 }
try {
- blocking(f.failed, Duration(0, "ms"))
+ blocking(f.failed, Duration(500, "ms"))
assert(false)
} catch {
case nsee: NoSuchElementException => done()