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

filtering out timeout-access header in additional tests (#20817)

Browse source
This commit is contained in:
gosubpl 2016-08-28 00:23:40 +02:00
parent 7690d1dbbd
commit ce4e208d85
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-http-core/src/test/scala/akka/http/impl/engine/server/HttpServerSpec.scala
View file

@ -40,7 +40,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|""") |""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com"))) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
shutdownBlueprint() shutdownBlueprint()
}) })
@ -141,7 +141,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|abcdefghijkl""") |abcdefghijkl""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual
HttpRequest( HttpRequest(
method = POST, method = POST,
uri = "http://example.com/strict", uri = "http://example.com/strict",
@ -205,7 +205,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|abcdefghijkl""") |abcdefghijkl""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual
HttpRequest( HttpRequest(
method = POST, method = POST,
uri = "http://example.com/strict", uri = "http://example.com/strict",
@ -218,7 +218,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|mnopqrstuvwx""") |mnopqrstuvwx""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual
HttpRequest( HttpRequest(
method = POST, method = POST,
uri = "http://example.com/next-strict", uri = "http://example.com/next-strict",
@ -446,7 +446,7 @@ class HttpServerSpec extends AkkaSpec(
|Host: example.com |Host: example.com
| |
|""") |""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(GET, uri = "http://example.com/", headers = List(Host("example.com"))) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(GET, uri = "http://example.com/", headers = List(Host("example.com")))
shutdownBlueprint() shutdownBlueprint()
}) })
@ -456,7 +456,7 @@ class HttpServerSpec extends AkkaSpec(
|Host: example.com |Host: example.com
| |
|""") |""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(HEAD, uri = "http://example.com/", headers = List(Host("example.com"))) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(HEAD, uri = "http://example.com/", headers = List(Host("example.com")))
shutdownBlueprint() shutdownBlueprint()
}) })
@ -696,7 +696,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|""".stripMarginWithNewline("\r\n")) |""".stripMarginWithNewline("\r\n"))
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com"))) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/", headers = List(Host("example.com")))
responses.expectRequest() responses.expectRequest()
responses.sendError(new RuntimeException("CRASH BOOM BANG")) responses.sendError(new RuntimeException("CRASH BOOM BANG"))
@ -758,7 +758,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|""") |""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com//foo", headers = List(Host("example.com"))) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com//foo", headers = List(Host("example.com")))
shutdownBlueprint() shutdownBlueprint()
}) })
@ -767,7 +767,7 @@ class HttpServerSpec extends AkkaSpec(
| |
|""") |""")
expectRequest() mapHeaders(_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/abc", protocol = HttpProtocols.`HTTP/1.0`) expectRequest() mapHeaders (_.filterNot(_.is("timeout-access"))) shouldEqual HttpRequest(uri = "http://example.com/abc", protocol = HttpProtocols.`HTTP/1.0`)
override def settings: ServerSettings = super.settings.withDefaultHostHeader(Host("example.com")) override def settings: ServerSettings = super.settings.withDefaultHostHeader(Host("example.com"))

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

@ -447,7 +447,7 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll wit
val serverInSub = serverIn.expectSubscription() val serverInSub = serverIn.expectSubscription()
serverInSub.request(1) serverInSub.request(1)
private val HttpRequest(POST, uri, List(Accept(Seq(MediaRanges.`*/*`)), Host(_, _), `User-Agent`(_)), private val HttpRequest(POST, uri, List(Accept(Seq(MediaRanges.`*/*`)), Host(_, _), `User-Agent`(_)),
Chunked(`chunkedContentType`, chunkStream), HttpProtocols.`HTTP/1.1`) = serverIn.expectNext() Chunked(`chunkedContentType`, chunkStream), HttpProtocols.`HTTP/1.1`) = serverIn.expectNext() mapHeaders (_.filterNot(_.is("timeout-access")))
uri shouldEqual Uri(s"http://$hostname:$port/chunked") uri shouldEqual Uri(s"http://$hostname:$port/chunked")
Await.result(chunkStream.limit(5).runWith(Sink.seq), 100.millis) shouldEqual chunks Await.result(chunkStream.limit(5).runWith(Sink.seq), 100.millis) shouldEqual chunks