Notify MembershipChangeListeners when 'members' change

akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerSpec.scala

@@ -37,7 +37,6 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan
       awaitClusterUp(first)
 
       runOn(first, second) {
-        cluster.join(firstAddress)
         val latch = TestLatch()
         cluster.registerListener(new MembershipChangeListener {
           def notify(members: SortedSet[Member]) {
@@ -45,8 +44,13 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan
               latch.countDown()
           }
         })
+        testConductor.enter("listener-1-registered")
+        cluster.join(firstAddress)
         latch.await
-        cluster.convergence.isDefined must be(true)
+      }
+
+      runOn(third) {
+        testConductor.enter("listener-1-registered")
       }
 
       testConductor.enter("after-1")
@@ -54,10 +58,6 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan
 
     "(when three nodes) after cluster convergence updates the membership table then all MembershipChangeListeners should be triggered" taggedAs LongRunningTest in {
 
-      runOn(third) {
-        cluster.join(firstAddress)
-      }
-
       val latch = TestLatch()
       cluster.registerListener(new MembershipChangeListener {
         def notify(members: SortedSet[Member]) {
@@ -65,8 +65,13 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan
             latch.countDown()
         }
       })
+      testConductor.enter("listener-2-registered")
+
+      runOn(third) {
+        cluster.join(firstAddress)
+      }
+
       latch.await
-      cluster.convergence.isDefined must be(true)
 
       testConductor.enter("after-2")
     }

akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala

@@ -52,7 +52,7 @@ abstract class SunnyWeatherSpec
       }
 
       // add a few more
-      awaitClusterUp(first, second, third, fourth, fifth)
+      awaitClusterUp(roles: _*)
       log.info("5 joined")
 
       val unexpected = new AtomicReference[SortedSet[Member]]