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

#21466 Wrong protocol name expected in tests when using Artery

Browse source
This commit is contained in:
Endre Sándor Varga 2016-09-16 11:47:29 +02:00
parent e2ea9fc46a
commit 2acfb8cfac
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
View file

@ -23,6 +23,7 @@ import akka.cluster.ddata.Replicator.Internal._
import akka.cluster.ddata.VersionVector import akka.cluster.ddata.VersionVector
import akka.testkit.TestKit import akka.testkit.TestKit
import akka.cluster.UniqueAddress import akka.cluster.UniqueAddress
import akka.remote.RARP
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
class ReplicatedDataSerializerSpec extends TestKit(ActorSystem( class ReplicatedDataSerializerSpec extends TestKit(ActorSystem(
@ -34,9 +35,11 @@ class ReplicatedDataSerializerSpec extends TestKit(ActorSystem(
val serializer = new ReplicatedDataSerializer(system.asInstanceOf[ExtendedActorSystem]) val serializer = new ReplicatedDataSerializer(system.asInstanceOf[ExtendedActorSystem])
val address1 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4711), 1) val Protocol = if (RARP(system).provider.remoteSettings.Artery.Enabled) "akka" else "akka.tcp"
val address2 = UniqueAddress(Address("akka.tcp", system.name, "other.host.org", 4711), 2)
val address3 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4712), 3) val address1 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4711), 1)
val address2 = UniqueAddress(Address(Protocol, system.name, "other.host.org", 4711), 2)
val address3 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4712), 3)
override def afterAll { override def afterAll {
shutdown() shutdown()

9
akka-distributed-data/src/test/scala/akka/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
View file

@ -21,6 +21,7 @@ import akka.cluster.ddata.Replicator.Internal._
import akka.testkit.TestKit import akka.testkit.TestKit
import akka.util.ByteString import akka.util.ByteString
import akka.cluster.UniqueAddress import akka.cluster.UniqueAddress
import akka.remote.RARP
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem( class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem(
@ -32,9 +33,11 @@ class ReplicatorMessageSerializerSpec extends TestKit(ActorSystem(
val serializer = new ReplicatorMessageSerializer(system.asInstanceOf[ExtendedActorSystem]) val serializer = new ReplicatorMessageSerializer(system.asInstanceOf[ExtendedActorSystem])
val address1 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4711), 1) val Protocol = if (RARP(system).provider.remoteSettings.Artery.Enabled) "akka" else "akka.tcp"
val address2 = UniqueAddress(Address("akka.tcp", system.name, "other.host.org", 4711), 2)
val address3 = UniqueAddress(Address("akka.tcp", system.name, "some.host.org", 4712), 3) val address1 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4711), 1)
val address2 = UniqueAddress(Address(Protocol, system.name, "other.host.org", 4711), 2)
val address3 = UniqueAddress(Address(Protocol, system.name, "some.host.org", 4712), 3)
val keyA = GSetKey[String]("A") val keyA = GSetKey[String]("A")