Merge pull request #1316 from akka/wip-3207-longer-timeout-in-futuredocspec-√

#3207 - prolonging the timeouts in FutureDocSpec to be less flaky when ...
This commit is contained in:
Viktor Klang (√) 2013-04-09 15:45:37 -07:00
commit 2c4c5b0594

View file

@ -104,7 +104,7 @@ class FutureDocSpec extends AkkaSpec {
} }
future foreach println future foreach println
//#future-eval //#future-eval
Await.result(future, 1 second) must be("HelloWorld") Await.result(future, 3 seconds) must be("HelloWorld")
} }
"demonstrate usage of map" in { "demonstrate usage of map" in {
@ -117,7 +117,7 @@ class FutureDocSpec extends AkkaSpec {
} }
f2 foreach println f2 foreach println
//#map //#map
val result = Await.result(f2, 1 second) val result = Await.result(f2, 3 seconds)
result must be(10) result must be(10)
f1.value must be(Some(Success("HelloWorld"))) f1.value must be(Some(Success("HelloWorld")))
} }
@ -135,7 +135,7 @@ class FutureDocSpec extends AkkaSpec {
} }
f3 foreach println f3 foreach println
//#wrong-nested-map //#wrong-nested-map
Await.ready(f3, 1 second) Await.ready(f3, 3 seconds)
} }
"demonstrate usage of flatMap" in { "demonstrate usage of flatMap" in {
@ -151,7 +151,7 @@ class FutureDocSpec extends AkkaSpec {
} }
f3 foreach println f3 foreach println
//#flat-map //#flat-map
val result = Await.result(f3, 1 second) val result = Await.result(f3, 3 seconds)
result must be(30) result must be(30)
} }
@ -169,9 +169,9 @@ class FutureDocSpec extends AkkaSpec {
failedFilter foreach println failedFilter foreach println
//#filter //#filter
val result = Await.result(future2, 1 second) val result = Await.result(future2, 3 seconds)
result must be(4) result must be(4)
val result2 = Await.result(failedFilter, 1 second) val result2 = Await.result(failedFilter, 3 seconds)
result2 must be(0) //Can only be 0 when there was a MatchError result2 must be(0) //Can only be 0 when there was a MatchError
} }
@ -189,7 +189,7 @@ class FutureDocSpec extends AkkaSpec {
f foreach println f foreach println
//#for-comprehension //#for-comprehension
val result = Await.result(f, 1 second) val result = Await.result(f, 3 seconds)
result must be(24) result must be(24)
} }
@ -207,12 +207,12 @@ class FutureDocSpec extends AkkaSpec {
val f1 = ask(actor1, msg1) val f1 = ask(actor1, msg1)
val f2 = ask(actor2, msg2) val f2 = ask(actor2, msg2)
val a = Await.result(f1, 1 second).asInstanceOf[Int] val a = Await.result(f1, 3 seconds).asInstanceOf[Int]
val b = Await.result(f2, 1 second).asInstanceOf[Int] val b = Await.result(f2, 3 seconds).asInstanceOf[Int]
val f3 = ask(actor3, (a + b)) val f3 = ask(actor3, (a + b))
val result = Await.result(f3, 1 second).asInstanceOf[Int] val result = Await.result(f3, 3 seconds).asInstanceOf[Int]
//#composing-wrong //#composing-wrong
result must be(3) result must be(3)
} }
@ -239,7 +239,7 @@ class FutureDocSpec extends AkkaSpec {
f3 foreach println f3 foreach println
//#composing //#composing
val result = Await.result(f3, 1 second).asInstanceOf[Int] val result = Await.result(f3, 3 seconds).asInstanceOf[Int]
result must be(3) result must be(3)
} }
@ -257,7 +257,7 @@ class FutureDocSpec extends AkkaSpec {
val oddSum = futureList.map(_.sum) val oddSum = futureList.map(_.sum)
oddSum foreach println oddSum foreach println
//#sequence-ask //#sequence-ask
Await.result(oddSum, 1 second).asInstanceOf[Int] must be(10000) Await.result(oddSum, 3 seconds).asInstanceOf[Int] must be(10000)
} }
"demonstrate usage of sequence" in { "demonstrate usage of sequence" in {
@ -266,7 +266,7 @@ class FutureDocSpec extends AkkaSpec {
val oddSum = futureList.map(_.sum) val oddSum = futureList.map(_.sum)
oddSum foreach println oddSum foreach println
//#sequence //#sequence
Await.result(oddSum, 1 second).asInstanceOf[Int] must be(10000) Await.result(oddSum, 3 seconds).asInstanceOf[Int] must be(10000)
} }
"demonstrate usage of traverse" in { "demonstrate usage of traverse" in {
@ -275,7 +275,7 @@ class FutureDocSpec extends AkkaSpec {
val oddSum = futureList.map(_.sum) val oddSum = futureList.map(_.sum)
oddSum foreach println oddSum foreach println
//#traverse //#traverse
Await.result(oddSum, 1 second).asInstanceOf[Int] must be(10000) Await.result(oddSum, 3 seconds).asInstanceOf[Int] must be(10000)
} }
"demonstrate usage of fold" in { "demonstrate usage of fold" in {
@ -285,7 +285,7 @@ class FutureDocSpec extends AkkaSpec {
val futureSum = Future.fold(futures)(0)(_ + _) val futureSum = Future.fold(futures)(0)(_ + _)
futureSum foreach println futureSum foreach println
//#fold //#fold
Await.result(futureSum, 1 second) must be(1001000) Await.result(futureSum, 3 seconds) must be(1001000)
} }
"demonstrate usage of reduce" in { "demonstrate usage of reduce" in {
@ -295,7 +295,7 @@ class FutureDocSpec extends AkkaSpec {
val futureSum = Future.reduce(futures)(_ + _) val futureSum = Future.reduce(futures)(_ + _)
futureSum foreach println futureSum foreach println
//#reduce //#reduce
Await.result(futureSum, 1 second) must be(1001000) Await.result(futureSum, 3 seconds) must be(1001000)
} }
"demonstrate usage of recover" in { "demonstrate usage of recover" in {
@ -308,7 +308,7 @@ class FutureDocSpec extends AkkaSpec {
} }
future foreach println future foreach println
//#recover //#recover
Await.result(future, 1 second) must be(0) Await.result(future, 3 seconds) must be(0)
} }
"demonstrate usage of recoverWith" in { "demonstrate usage of recoverWith" in {
@ -323,7 +323,7 @@ class FutureDocSpec extends AkkaSpec {
} }
future foreach println future foreach println
//#try-recover //#try-recover
Await.result(future, 1 second) must be(0) Await.result(future, 3 seconds) must be(0)
} }
"demonstrate usage of zip" in { "demonstrate usage of zip" in {
@ -333,7 +333,7 @@ class FutureDocSpec extends AkkaSpec {
val future3 = future1 zip future2 map { case (a, b) a + " " + b } val future3 = future1 zip future2 map { case (a, b) a + " " + b }
future3 foreach println future3 foreach println
//#zip //#zip
Await.result(future3, 1 second) must be("foo bar") Await.result(future3, 3 seconds) must be("foo bar")
} }
"demonstrate usage of andThen" in { "demonstrate usage of andThen" in {
@ -349,7 +349,7 @@ class FutureDocSpec extends AkkaSpec {
} }
result foreach println result foreach println
//#and-then //#and-then
Await.result(result, 1 second) must be("foo bar") Await.result(result, 3 seconds) must be("foo bar")
} }
"demonstrate usage of fallbackTo" in { "demonstrate usage of fallbackTo" in {
@ -360,7 +360,7 @@ class FutureDocSpec extends AkkaSpec {
val future4 = future1 fallbackTo future2 fallbackTo future3 val future4 = future1 fallbackTo future2 fallbackTo future3
future4 foreach println future4 foreach println
//#fallback-to //#fallback-to
Await.result(future4, 1 second) must be("foo") Await.result(future4, 3 seconds) must be("foo")
} }
"demonstrate usage of onSuccess & onFailure & onComplete" in { "demonstrate usage of onSuccess & onFailure & onComplete" in {
@ -372,7 +372,7 @@ class FutureDocSpec extends AkkaSpec {
case x: String println("Got some random string: " + x) case x: String println("Got some random string: " + x)
} }
//#onSuccess //#onSuccess
Await.result(future, 1 second) must be("foo") Await.result(future, 3 seconds) must be("foo")
} }
{ {
val future = Future.failed[String](new IllegalStateException("OHNOES")) val future = Future.failed[String](new IllegalStateException("OHNOES"))
@ -395,7 +395,7 @@ class FutureDocSpec extends AkkaSpec {
case Failure(failure) doSomethingOnFailure(failure) case Failure(failure) doSomethingOnFailure(failure)
} }
//#onComplete //#onComplete
Await.result(future, 1 second) must be("foo") Await.result(future, 3 seconds) must be("foo")
} }
} }
@ -406,8 +406,8 @@ class FutureDocSpec extends AkkaSpec {
//#failed //#failed
val otherFuture = Future.failed[String](new IllegalArgumentException("Bang!")) val otherFuture = Future.failed[String](new IllegalArgumentException("Bang!"))
//#failed //#failed
Await.result(future, 1 second) must be("Yay!") Await.result(future, 3 seconds) must be("Yay!")
intercept[IllegalArgumentException] { Await.result(otherFuture, 1 second) } intercept[IllegalArgumentException] { Await.result(otherFuture, 3 seconds) }
} }
"demonstrate usage of pattern.after" in { "demonstrate usage of pattern.after" in {