From 0d51fb2ed5a76be97f679b8a5ee2fac7a0d8dc25 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Thu, 24 May 2012 17:36:00 +0200 Subject: [PATCH] Use ifNode for asserts. See #2111 --- .../akka/cluster/JoinTwoClustersSpec.scala | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala index 9c59beb70e..b5e764ea23 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala @@ -72,12 +72,7 @@ abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvm awaitUpConvergence(numberOfMembers = 2) - runOn(a1, b1, c1) { - node().isLeader must be(true) - } - runOn(a2, b2, c2) { - node().isLeader must be(false) - } + node().isLeader must be(ifNode(a1, b1, c1)(true)(false)) runOn(b2) { node().join(a1Address) @@ -87,12 +82,7 @@ abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvm awaitUpConvergence(numberOfMembers = 4) } - runOn(a1, c1) { - node().isLeader must be(true) - } - runOn(a2, b1, b2, c2) { - node().isLeader must be(false) - } + node().isLeader must be(ifNode(a1, c1)(true)(false)) } @@ -104,12 +94,7 @@ abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvm awaitUpConvergence(numberOfMembers = 6) - runOn(a1) { - node().isLeader must be(true) - } - runOn(a2, b1, b2, c1, c2) { - node().isLeader must be(false) - } + node().isLeader must be(ifNode(a1)(true)(false)) } }