diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 14:48:49 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-10-01 14:48:49 +1000 |
commit | a9f4981fedd8cf563bed570853a822196ae30632 (patch) | |
tree | 9e177afac9acffb24f0313faa39bd383e3c9cb9d /src | |
parent | ce7f9f00c2d649f3f9ff3ad11fb2ac91b9094ed3 (diff) | |
download | scala-a9f4981fedd8cf563bed570853a822196ae30632.tar.gz scala-a9f4981fedd8cf563bed570853a822196ae30632.tar.bz2 scala-a9f4981fedd8cf563bed570853a822196ae30632.zip |
Increase REPL startup timeout to avoid test failures
Under load on Jenkins, we've been seeing:
```
% diff /localhome/jenkins/a/workspace/scala-nightly-auxjvm-2.12.x/jdk/jdk7/label/auxjvm/test/files/run/t4542-run.log /localhome/jenkins/a/workspace/scala-nightly-auxjvm-2.12.x/jdk/jdk7/label/auxjvm/test/files/run/t4542.check
@@ -2,75 +2,14 @@ Type in expressions to have them evaluated.
Type :help for more information.
scala> @deprecated("foooo", "ReplTest version 1.0-FINAL") class Foo() {
java.util.concurrent.TimeoutException: Futures timed out after [60 seconds]
at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:219)
at scala.concurrent.impl.Promise$DefaultPromise.ready(Promise.scala:153)
at scala.concurrent.Await$$anonfun$ready$1.apply(package.scala:95)
at scala.concurrent.Await$$anonfun$ready$1.apply(package.scala:95)
at scala.concurrent.BlockContext$DefaultBlockContext$.blockOn(BlockContext.scala:53)
at scala.concurrent.Await$.ready(package.scala:95)
at scala.tools.nsc.interpreter.ILoop.processLine(ILoop.scala:431)
at scala.tools.nsc.interpreter.ILoop.loop(ILoop.scala:457)
at scala.tools.nsc.interpreter.ILoop$$anonfun$process$1.apply$mcZ$sp(ILoop.scala:875)
```
This commit bumps the timeout up be a factor of ten to try to
restore that comforting green glow to https://scala-webapps.epfl.ch/jenkins/view/2.N.x
Diffstat (limited to 'src')
-rw-r--r-- | src/repl/scala/tools/nsc/interpreter/ILoop.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ILoop.scala b/src/repl/scala/tools/nsc/interpreter/ILoop.scala index 50c89f7442..6197aea93d 100644 --- a/src/repl/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/repl/scala/tools/nsc/interpreter/ILoop.scala @@ -428,7 +428,7 @@ class ILoop(in0: Option[BufferedReader], protected val out: JPrintWriter) // return false if repl should exit def processLine(line: String): Boolean = { import scala.concurrent.duration._ - Await.ready(globalFuture, 60.seconds) + Await.ready(globalFuture, 10.minutes) // Long timeout here to avoid test failures under heavy load. if (line eq null) { // SI-4563: this means the console was properly interrupted (Ctrl+D usually) |