diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-19 07:02:44 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-19 07:02:44 -0800 |
| commit | 4a5c6a01840404edd362bd388e39f68cb6af5dc7 (patch) | |
| tree | 26643b113bea675ed97ea7c55c8a0b38ec182266 /test/files | |
| parent | 87e369ef46bd2ca569ffd1cd6f3a554f1d645dc9 (diff) | |
| parent | 91dcdbd377b02f36b26420e2862eb597f5698c6d (diff) | |
| download | scala-4a5c6a01840404edd362bd388e39f68cb6af5dc7.tar.gz scala-4a5c6a01840404edd362bd388e39f68cb6af5dc7.tar.bz2 scala-4a5c6a01840404edd362bd388e39f68cb6af5dc7.zip | |
Merge remote-tracking branch 'phaller/execution-context'
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/jvm/scala-concurrent-tck.scala | 2 |
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() |