aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorphaller <hallerp@gmail.com>2012-10-29 14:40:12 +0100
committerphaller <hallerp@gmail.com>2012-10-29 14:40:12 +0100
commit4ce496401b8e2c999bb69593ad31bc39ea2bfd0c (patch)
treee74ec38201717216f79ce148e0cf47b5cbaddf62 /src
parentf2b725ee46637b5f4f6d213c0fc0f3157a481596 (diff)
downloadscala-async-4ce496401b8e2c999bb69593ad31bc39ea2bfd0c.tar.gz
scala-async-4ce496401b8e2c999bb69593ad31bc39ea2bfd0c.tar.bz2
scala-async-4ce496401b8e2c999bb69593ad31bc39ea2bfd0c.zip
Tweak build and test scripts
Diffstat (limited to 'src')
-rw-r--r--src/async/test/async-spec/AsyncSpec.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/async/test/async-spec/AsyncSpec.scala b/src/async/test/async-spec/AsyncSpec.scala
index a537029..afd4c6c 100644
--- a/src/async/test/async-spec/AsyncSpec.scala
+++ b/src/async/test/async-spec/AsyncSpec.scala
@@ -20,7 +20,7 @@ class Test1Class {
import ExecutionContext.Implicits.global
def m1(x: Int): Future[Int] = future {
- Thread.sleep(2000)
+ Thread.sleep(1000)
x + 2
}
@@ -67,7 +67,7 @@ object AsyncSpec extends MinimalScalaTest {
"support several awaits in sequence" in {
val o = new Test1Class
val fut = o.m3(10)
- val res = Await.result(fut, 10 seconds)
+ val res = Await.result(fut, 4 seconds)
res mustBe(26)
}
}