Make it more intuitive for tests using real Cluster(system) extension, see #2103

* We will write more tests that rely on real Cluster(system) extension,
  such as ClusterRoundRobinRoutedActorSpec
* When not using FailureDetectorStrategy or overriding seed nodes
  MultiNodeClusterSpec will use the real Cluster(system) extension
  instead of a new Cluster instance with additional test facilities
This commit is contained in:
Patrik Nordwall 2012-08-28 16:38:05 +02:00
parent f1626ca1d3
commit f4cc8f8649
14 changed files with 42 additions and 34 deletions

View file

@ -20,7 +20,6 @@ import akka.testkit._
import scala.concurrent.util.duration._
import akka.cluster.MultiNodeClusterSpec
import com.typesafe.config.ConfigFactory
import akka.cluster.FailureDetectorPuppetStrategy
import akka.cluster.Cluster
object ClusterRoundRobinRoutedActorMultiJvmSpec extends MultiNodeConfig {
@ -50,10 +49,10 @@ object ClusterRoundRobinRoutedActorMultiJvmSpec extends MultiNodeConfig {
}
class ClusterRoundRobinRoutedActorMultiJvmNode1 extends ClusterRoundRobinRoutedActorSpec with FailureDetectorPuppetStrategy
class ClusterRoundRobinRoutedActorMultiJvmNode2 extends ClusterRoundRobinRoutedActorSpec with FailureDetectorPuppetStrategy
class ClusterRoundRobinRoutedActorMultiJvmNode3 extends ClusterRoundRobinRoutedActorSpec with FailureDetectorPuppetStrategy
class ClusterRoundRobinRoutedActorMultiJvmNode4 extends ClusterRoundRobinRoutedActorSpec with FailureDetectorPuppetStrategy
class ClusterRoundRobinRoutedActorMultiJvmNode1 extends ClusterRoundRobinRoutedActorSpec
class ClusterRoundRobinRoutedActorMultiJvmNode2 extends ClusterRoundRobinRoutedActorSpec
class ClusterRoundRobinRoutedActorMultiJvmNode3 extends ClusterRoundRobinRoutedActorSpec
class ClusterRoundRobinRoutedActorMultiJvmNode4 extends ClusterRoundRobinRoutedActorSpec
abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRoundRobinRoutedActorMultiJvmSpec)
with MultiNodeClusterSpec
@ -63,9 +62,6 @@ abstract class ClusterRoundRobinRoutedActorSpec extends MultiNodeSpec(ClusterRou
// sorted in the order used by the cluster
lazy val sortedRoles = Seq(first, second, third, fourth).sorted
// FIXME make this use of Cluster(system) more easy to use in tests
override def cluster: Cluster = Cluster(system)
"A cluster router configured with a RoundRobin router" must {
"start cluster" taggedAs LongRunningTest in {
awaitClusterUp(first, second, third, fourth)