=htc, str remove references to 'akka.io.tcp.windows-connection-abort-workaround-enabled' setting

This commit is contained in:
2beaucoup 2015-12-11 15:59:37 +01:00
parent 474fb870e9
commit a39aed086e
4 changed files with 3 additions and 9 deletions

View file

@ -26,8 +26,7 @@ import akka.http.scaladsl.model._
class ConnectionPoolSpec extends AkkaSpec(""" class ConnectionPoolSpec extends AkkaSpec("""
akka.loggers = [] akka.loggers = []
akka.loglevel = OFF akka.loglevel = OFF
akka.io.tcp.trace-logging = off akka.io.tcp.trace-logging = off""") {
akka.io.tcp.windows-connection-abort-workaround-enabled=auto""") {
implicit val materializer = ActorMaterializer() implicit val materializer = ActorMaterializer()
// FIXME: Extract into proper util class to be reusable // FIXME: Extract into proper util class to be reusable

View file

@ -21,8 +21,7 @@ import javax.net.ssl.SSLException
class TlsEndpointVerificationSpec extends AkkaSpec(""" class TlsEndpointVerificationSpec extends AkkaSpec("""
akka.loglevel = DEBUG akka.loglevel = DEBUG
akka.io.tcp.trace-logging = off akka.io.tcp.trace-logging = off""") with ScalaFutures {
akka.io.tcp.windows-connection-abort-workaround-enabled=auto""") with ScalaFutures {
implicit val materializer = ActorMaterializer() implicit val materializer = ActorMaterializer()
val timeout = Timeout(Span(3, Seconds)) val timeout = Timeout(Span(3, Seconds))

View file

@ -33,7 +33,6 @@ class ClientServerSpec extends WordSpec with Matchers with BeforeAndAfterAll {
akka.loglevel = ERROR akka.loglevel = ERROR
akka.stdout-loglevel = ERROR akka.stdout-loglevel = ERROR
akka.log-dead-letters = OFF akka.log-dead-letters = OFF
akka.io.tcp.windows-connection-abort-workaround-enabled = auto
""") """)
implicit val system = ActorSystem(getClass.getSimpleName, testConf) implicit val system = ActorSystem(getClass.getSimpleName, testConf)
import system.dispatcher import system.dispatcher

View file

@ -19,10 +19,7 @@ import scala.concurrent.duration._
import java.net.BindException import java.net.BindException
import akka.testkit.EventFilter import akka.testkit.EventFilter
class TcpSpec extends AkkaSpec( class TcpSpec extends AkkaSpec("akka.stream.materializer.subscription-timeout.timeout = 2s") with TcpHelper {
"""
|akka.io.tcp.windows-connection-abort-workaround-enabled=auto
|akka.stream.materializer.subscription-timeout.timeout = 2s""".stripMargin) with TcpHelper {
var demand = 0L var demand = 0L
"Outgoing TCP stream" must { "Outgoing TCP stream" must {