raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Temp workaround in tests for the duplicate MemberUp events, see #3239

Browse source
This commit is contained in:
Patrik Nordwall 2013-04-18 22:07:11 +02:00
parent c7db89e9ab
commit c0e96f55bb
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSingleMasterSpec.scala
View file

@ -80,8 +80,14 @@ abstract class StatsSampleSingleMasterSpec extends MultiNodeSpec(StatsSampleSing
Cluster(system) join firstAddress
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
Set(firstAddress, secondAddress, thirdAddress))
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
// 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)

10
akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/StatsSampleSpec.scala
View file

@ -97,8 +97,14 @@ abstract class StatsSampleSpec extends MultiNodeSpec(StatsSampleSpecConfig)
system.actorOf(Props[StatsWorker], "statsWorker")
system.actorOf(Props[StatsService], "statsService")
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
Set(firstAddress, secondAddress, thirdAddress))
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
// 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)

10
akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleJapiSpec.scala
View file

@ -82,8 +82,14 @@ abstract class StatsSampleJapiSpec extends MultiNodeSpec(StatsSampleJapiSpecConf
system.actorOf(Props[StatsWorker], "statsWorker")
system.actorOf(Props[StatsService], "statsService")
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
Set(firstAddress, secondAddress, thirdAddress))
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
// 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)

10
akka-samples/akka-sample-cluster/src/multi-jvm/scala/sample/cluster/stats/japi/StatsSampleSingleMasterJapiSpec.scala
View file

@ -80,8 +80,14 @@ abstract class StatsSampleSingleMasterJapiSpec extends MultiNodeSpec(StatsSample
Cluster(system) join firstAddress
receiveN(3).collect { case MemberUp(m) => m.address }.toSet must be (
Set(firstAddress, secondAddress, thirdAddress))
// FIXME ticket 3239 duplicate MemberUp events, it should be possible to use
// 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)