raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

make racy test accept 500 or exception

Browse source
This commit is contained in:
Endre Sándor Varga 2015-06-23 13:00:26 +02:00
parent d50b1b0de3
commit 5192ea7334
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-http-core/src/test/scala/akka/http/scaladsl/ClientServerSpec.scala
View file

@ -149,7 +149,12 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll {
EventFilter[RuntimeException](message = "BOOM", occurrences = 1).intercept {
val (_, responseFuture) =
Http(system2).outgoingConnection(hostname, port).runWith(Source.single(HttpRequest()), Sink.head)(materializer2)
Await.result(responseFuture.failed, 5.second) shouldBe a[StreamTcpException]
try Await.result(responseFuture, 5.second).status should ===(StatusCodes.InternalServerError)
catch {
case _: StreamTcpException ⇒
// Also fine, depends on the race between abort and 500, caused by materialization panic which
// tries to tear down everything, but the order is nondeterministic
}
}(system2)
Await.result(b1.unbind(), 1.second)
}(materializer2)
@ -163,7 +168,12 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll {
EventFilter[RuntimeException](message = "BOOM", occurrences = 1).intercept {
val (_, responseFuture) =
Http(system2).outgoingConnection(hostname, port).runWith(Source.single(HttpRequest()), Sink.head)(materializer2)
Await.result(responseFuture.failed, 5.second) shouldBe a[StreamTcpException]
try Await.result(responseFuture, 5.seconds).status should ===(StatusCodes.InternalServerError)
catch {
case _: StreamTcpException ⇒
// Also fine, depends on the race between abort and 500, caused by materialization panic which
// tries to tear down everything, but the order is nondeterministic
}
}(system2)
Await.result(b1.unbind(), 1.second)
}(materializer2)