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

Disable TlsTcpWithActorSystemSetupSpec when not running tcp-tls tests

Browse source
This commit is contained in:
Christopher Batey 2018-05-01 09:49:51 +01:00
parent 945440a38d
commit c0f18c96d3
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-remote/src/test/scala/akka/remote/artery/ArteryMultiNodeSpec.scala
View file

@ -63,4 +63,9 @@ abstract class ArteryMultiNodeSpec(config: Config) extends AkkaSpec(config.withF
remoteSystems = Vector.empty remoteSystems = Vector.empty
super.afterTermination() super.afterTermination()
} }
def arteryTcpTlsEnabled(system: ActorSystem = system): Boolean = {
val arterySettings = ArterySettings(system.settings.config.getConfig("akka.remote.artery"))
arterySettings.Enabled && arterySettings.Transport == ArterySettings.TlsTcp
}
} }

7
akka-remote/src/test/scala/akka/remote/artery/tcp/TlsTcpSpec.scala
View file

@ -163,8 +163,7 @@ class TlsTcpWithHostnameVerificationSpec extends ArteryMultiNodeSpec(
"Artery with TLS/TCP and hostname-verification=on" must { "Artery with TLS/TCP and hostname-verification=on" must {
"reject invalid" in { "reject invalid" in {
// this test only makes sense with tls-tcp transport // this test only makes sense with tls-tcp transport
val arterySettings = ArterySettings(system.settings.config.getConfig("akka.remote.artery")) if (!arteryTcpTlsEnabled())
if (!arterySettings.Enabled || arterySettings.Transport != ArterySettings.TlsTcp)
pending pending
systemB.actorOf(TestActors.echoActorProps, "echo") systemB.actorOf(TestActors.echoActorProps, "echo")
@ -179,6 +178,7 @@ class TlsTcpWithActorSystemSetupSpec
val sslProviderServerProbe = TestProbe() val sslProviderServerProbe = TestProbe()
val sslProviderClientProbe = TestProbe() val sslProviderClientProbe = TestProbe()
val sslProviderSetup = SSLEngineProviderSetup(sys ⇒ new ConfigSSLEngineProvider(sys) { val sslProviderSetup = SSLEngineProviderSetup(sys ⇒ new ConfigSSLEngineProvider(sys) {
override def createServerSSLEngine(hostname: String, port: Int): SSLEngine = { override def createServerSSLEngine(hostname: String, port: Int): SSLEngine = {
sslProviderServerProbe.ref ! "createServerSSLEngine" sslProviderServerProbe.ref ! "createServerSSLEngine"
@ -198,6 +198,9 @@ class TlsTcpWithActorSystemSetupSpec
"Artery with TLS/TCP with SSLEngineProvider defined via Setup" must { "Artery with TLS/TCP with SSLEngineProvider defined via Setup" must {
"use the right SSLEngineProvider" in { "use the right SSLEngineProvider" in {
if (!arteryTcpTlsEnabled())
pending
systemB.actorOf(TestActors.echoActorProps, "echo") systemB.actorOf(TestActors.echoActorProps, "echo")
val path = rootB / "user" / "echo" val path = rootB / "user" / "echo"
system.actorSelection(path) ! Identify(path.name) system.actorSelection(path) ! Identify(path.name)