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

=str: Don't use "remaining", check proper localized TCP messages

Browse source
This commit is contained in:
Endre Sándor Varga 2015-05-21 16:03:10 +02:00
parent 0c8d9cb522
commit 2a2f2f075e
4 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
akka-http-core/src/test/scala/akka/http/impl/engine/client/ConnectionPoolSpec.scala
View file

@ -4,9 +4,13 @@
package akka.http.impl.engine.client
import java.net.InetSocketAddress
import java.nio.ByteBuffer
import java.nio.channels.{ SocketChannel, ServerSocketChannel }
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Await
import scala.concurrent.duration._
import scala.util.control.NonFatal
import scala.util.{ Failure, Success, Try }
import akka.util.ByteString
import akka.http.scaladsl.{ TestUtils, Http }
@ -19,9 +23,33 @@ import akka.stream.scaladsl._
import akka.http.scaladsl.model.headers._
import akka.http.scaladsl.model._
class ConnectionPoolSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = OFF\n akka.io.tcp.trace-logging = off") {
class ConnectionPoolSpec extends AkkaSpec("""
akka.loggers = []
akka.loglevel = OFF
akka.io.tcp.trace-logging = off
akka.io.tcp.windows-connection-abort-workaround-enabled=auto""") {
implicit val materializer = ActorFlowMaterializer()
// FIXME: Extract into proper util class to be reusable
lazy val ConnectionResetByPeerMessage: String = {
val serverSocket = ServerSocketChannel.open()
serverSocket.socket.bind(new InetSocketAddress("127.0.0.1", 0))
try {
val clientSocket = SocketChannel.open(new InetSocketAddress("127.0.0.1", serverSocket.socket().getLocalPort))
@volatile var serverSideChannel: SocketChannel = null
awaitCond {
serverSideChannel = serverSocket.accept()
serverSideChannel != null
}
serverSideChannel.socket.setSoLinger(true, 0)
serverSideChannel.close()
clientSocket.read(ByteBuffer.allocate(1))
null
} catch {
case NonFatal(e) ⇒ e.getMessage
}
}
"The host-level client infrastructure" should {
"properly complete a simple request/response cycle" in new TestSetup {
@ -104,7 +132,7 @@ class ConnectionPoolSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = O
val responses = Seq(responseOut.expectNext(), responseOut.expectNext())
responses mustContainLike { case (Success(x), 42) ⇒ requestUri(x) should endWith("/a") }
responses mustContainLike { case (Failure(x), 43) ⇒ x.getMessage should include("reset by peer") }
responses mustContainLike { case (Failure(x), 43) ⇒ x.getMessage should include(ConnectionResetByPeerMessage) }
}
"retry failed requests" in new TestSetup(autoAccept = true) {
@ -142,7 +170,7 @@ class ConnectionPoolSpec extends AkkaSpec("akka.loggers = []\n akka.loglevel = O
val responses = Seq(responseOut.expectNext(), responseOut.expectNext())
responses mustContainLike { case (Success(x), 42) ⇒ requestUri(x) should endWith("/a") }
responses mustContainLike { case (Failure(x), 43) ⇒ x.getMessage should include("reset by peer") }
responses mustContainLike { case (Failure(x), 43) ⇒ x.getMessage should include(ConnectionResetByPeerMessage) }
remainingResponsesToKill.get() shouldEqual 0
}