From 3502f0d72f7fd2f7e2248b39c91cc267c3b91ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 9 Sep 2016 18:12:35 +0200 Subject: [PATCH] One more missed canonical.port in cluster tests (#21428) --- .../multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala | 2 +- .../scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala index e6e38df16a..9c7903f9bc 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterDeathWatchSpec.scala @@ -63,7 +63,7 @@ abstract class ClusterDeathWatchSpec pending } -/* "receive Terminated when watched node becomes Down/Removed" in within(20 seconds) { + /* "receive Terminated when watched node becomes Down/Removed" in within(20 seconds) { awaitClusterUp(first, second, third, fourth) enterBarrier("cluster-up") diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala index a6a0aacb3a..5b7d26e320 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeJoinsAgainSpec.scala @@ -165,7 +165,7 @@ abstract class UnreachableNodeJoinsAgainSpec ConfigFactory.parseString( if (RARP(system).provider.remoteSettings.Artery.Enabled) s""" - akka.remote.artery { + akka.remote.artery.canonical { hostname = ${victimAddress.host.get} port = ${victimAddress.port.get} }