MultiDcSplitBrainSpec fixed #23288

2017-07-05 11:08:55 +02:00 · 2017-07-05 11:08:55 +02:00 · ab3efff3bd
commit ab3efff3bd
parent f5a40bfcb2
2 changed files with 28 additions and 22 deletions
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
@ -305,7 +305,9 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec with WatchedByCoro
      awaitAssert(clusterView.members.size should ===(numberOfMembers))
      awaitAssert(clusterView.members.map(_.status) should ===(Set(MemberStatus.Up)))
      // clusterView.leader is updated by LeaderChanged, await that to be updated also
-      val expectedLeader = clusterView.members.headOption.map(_.address)
+      val expectedLeader = clusterView.members.collectFirst {
+        case m if m.dataCenter == cluster.settings.DataCenter ⇒ m.address
+      }
      awaitAssert(clusterView.leader should ===(expectedLeader))
    }
  }