Temp workaround in tests for the duplicate MemberUp events, see #3239
This commit is contained in:
parent
c7db89e9ab
commit
c0e96f55bb
4 changed files with 32 additions and 8 deletions
|
|
@ -80,8 +80,14 @@ abstract class StatsSampleSingleMasterSpec extends MultiNodeSpec(StatsSampleSing
|
||||||
|
|
||||||
Cluster(system) join firstAddress
|
Cluster(system) join firstAddress
|
||||||
|
|
||||||
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
|
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
|
||||||
Set(firstAddress, secondAddress, thirdAddress))
|
// receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
import akka.actor.Address
|
||||||
|
@scala.annotation.tailrec def awaitMembersUp(expected: Set[Address], got: Set[Address] = Set.empty): Unit = {
|
||||||
|
val members = got + expectMsgType[MemberUp].member.address
|
||||||
|
if (members != expected) awaitMembersUp(expected, members)
|
||||||
|
}
|
||||||
|
awaitMembersUp(Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
|
||||||
Cluster(system).unsubscribe(testActor)
|
Cluster(system).unsubscribe(testActor)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,14 @@ abstract class StatsSampleSpec extends MultiNodeSpec(StatsSampleSpecConfig)
|
||||||
system.actorOf(Props[StatsWorker], "statsWorker")
|
system.actorOf(Props[StatsWorker], "statsWorker")
|
||||||
system.actorOf(Props[StatsService], "statsService")
|
system.actorOf(Props[StatsService], "statsService")
|
||||||
|
|
||||||
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
|
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
|
||||||
Set(firstAddress, secondAddress, thirdAddress))
|
// receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
import akka.actor.Address
|
||||||
|
@scala.annotation.tailrec def awaitMembersUp(expected: Set[Address], got: Set[Address] = Set.empty): Unit = {
|
||||||
|
val members = got + expectMsgType[MemberUp].member.address
|
||||||
|
if (members != expected) awaitMembersUp(expected, members)
|
||||||
|
}
|
||||||
|
awaitMembersUp(Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
|
||||||
Cluster(system).unsubscribe(testActor)
|
Cluster(system).unsubscribe(testActor)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,8 +82,14 @@ abstract class StatsSampleJapiSpec extends MultiNodeSpec(StatsSampleJapiSpecConf
|
||||||
system.actorOf(Props[StatsWorker], "statsWorker")
|
system.actorOf(Props[StatsWorker], "statsWorker")
|
||||||
system.actorOf(Props[StatsService], "statsService")
|
system.actorOf(Props[StatsService], "statsService")
|
||||||
|
|
||||||
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
|
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
|
||||||
Set(firstAddress, secondAddress, thirdAddress))
|
// receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
import akka.actor.Address
|
||||||
|
@scala.annotation.tailrec def awaitMembersUp(expected: Set[Address], got: Set[Address] = Set.empty): Unit = {
|
||||||
|
val members = got + expectMsgType[MemberUp].member.address
|
||||||
|
if (members != expected) awaitMembersUp(expected, members)
|
||||||
|
}
|
||||||
|
awaitMembersUp(Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
|
||||||
Cluster(system).unsubscribe(testActor)
|
Cluster(system).unsubscribe(testActor)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,8 +80,14 @@ abstract class StatsSampleSingleMasterJapiSpec extends MultiNodeSpec(StatsSample
|
||||||
|
|
||||||
Cluster(system) join firstAddress
|
Cluster(system) join firstAddress
|
||||||
|
|
||||||
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
|
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
|
||||||
Set(firstAddress, secondAddress, thirdAddress))
|
// receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
import akka.actor.Address
|
||||||
|
@scala.annotation.tailrec def awaitMembersUp(expected: Set[Address], got: Set[Address] = Set.empty): Unit = {
|
||||||
|
val members = got + expectMsgType[MemberUp].member.address
|
||||||
|
if (members != expected) awaitMembersUp(expected, members)
|
||||||
|
}
|
||||||
|
awaitMembersUp(Set(firstAddress, secondAddress, thirdAddress))
|
||||||
|
|
||||||
Cluster(system).unsubscribe(testActor)
|
Cluster(system).unsubscribe(testActor)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue