Port NodeMembershipSpec to MultiNodeSpec. See #2115

This commit is contained in:
Patrik Nordwall 2012-05-24 11:43:55 +02:00
parent 33cec55dbe
commit dd5a78597a
2 changed files with 144 additions and 139 deletions

View file

@ -13,7 +13,13 @@ object NodeStartupMultiJvmSpec extends MultiNodeConfig {
val first = role("first")
val second = role("second")
commonConfig(debugConfig(on = false))
commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
akka.cluster {
gossip-frequency = 200 ms
leader-actions-frequency = 200 ms
periodic-tasks-initial-delay = 300 ms
}
""")))
nodeConfig(first, ConfigFactory.parseString("""
# FIXME get rid of this hardcoded port
@ -27,29 +33,33 @@ object NodeStartupMultiJvmSpec extends MultiNodeConfig {
}
class NodeStartupMultiJvmNode1 extends NodeStartupSpec
class NodeStartupMultiJvmNode2 extends NodeStartupSpec
class NodeStartupMultiJvmNode1 extends NodeStartupSpec {
override var node: Cluster = _
}
class NodeStartupMultiJvmNode2 extends NodeStartupSpec {
override var node: Cluster = _
}
class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) with ImplicitSender with BeforeAndAfter {
abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) with ImplicitSender with BeforeAndAfter {
import NodeStartupMultiJvmSpec._
override def initialParticipants = 2
var firstNode: Cluster = _
var node: Cluster
after {
testConductor.enter("after")
}
runOn(first) {
firstNode = Cluster(system)
node = Cluster(system)
}
"A first cluster node with a 'node-to-join' config set to empty string (singleton cluster)" must {
"be a singleton cluster when started up" in {
runOn(first) {
awaitCond(firstNode.isSingletonCluster)
awaitCond(node.isSingletonCluster)
// FIXME #2117 singletonCluster should reach convergence
//awaitCond(firstNode.convergence.isDefined)
}
@ -57,7 +67,7 @@ class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) with Implic
"be in 'Joining' phase when started up" in {
runOn(first) {
val members = firstNode.latestGossip.members
val members = node.latestGossip.members
members.size must be(1)
val firstAddress = testConductor.getAddressFor(first).await
val joiningMember = members find (_.address == firstAddress)
@ -69,21 +79,25 @@ class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) with Implic
"A second cluster node with a 'node-to-join' config defined" must {
"join the other node cluster when sending a Join command" in {
val secondAddress = testConductor.getAddressFor(second).await
def awaitSecondUp = awaitCond {
node.latestGossip.members.exists { member
member.address == secondAddress && member.status == MemberStatus.Up
}
}
runOn(second) {
// start cluster on second node, and join
val secondNode = Cluster(system)
awaitCond(secondNode.convergence.isDefined)
node = Cluster(system)
awaitSecondUp
node.convergence.isDefined
}
runOn(first) {
val secondAddress = testConductor.getAddressFor(second).await
awaitCond {
firstNode.latestGossip.members.exists { member
member.address == secondAddress && member.status == MemberStatus.Up
}
}
firstNode.latestGossip.members.size must be(2)
awaitCond(firstNode.convergence.isDefined)
awaitSecondUp
node.latestGossip.members.size must be(2)
node.convergence.isDefined
}
}
}