summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-17 22:02:48 -0700
committerPaul Phillips <paulp@improving.org>2013-09-17 22:02:48 -0700
commitd45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (patch)
tree2b1a69b9c30ad87bb70910c62f54e37dc864dafa /test
parentc3d96eb483b11b4dfa61143b629dba27ba543fc3 (diff)
parent145aaa4299b95a771e275e16c5606603e245a9cc (diff)
downloadscala-d45a3c8cc8e9f1d95d797d548a85abd8597f5bc7.tar.gz
scala-d45a3c8cc8e9f1d95d797d548a85abd8597f5bc7.tar.bz2
scala-d45a3c8cc8e9f1d95d797d548a85abd8597f5bc7.zip
Merge pull request #2958 from paulp/pr/longer-timeout
Longer timeout for repl test.
Diffstat (limited to 'test')
-rw-r--r--test/files/run/t7805-repl-i.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/t7805-repl-i.scala b/test/files/run/t7805-repl-i.scala
index a4061689f0..bb5203951e 100644
--- a/test/files/run/t7805-repl-i.scala
+++ b/test/files/run/t7805-repl-i.scala
@@ -34,7 +34,7 @@ trait HangingRepl extends ReplTest {
import scala.concurrent.duration._
import ExecutionContext.Implicits._
import Resulting._
- def timeout = 15 seconds
+ def timeout = 120 seconds
def hanging[A](a: =>A): A = future(a) resultWithin timeout
override def show() = Try(hanging(super.show())) recover {
case e => e.printStackTrace()