From 17d54f1ae8c984066c06edcc733b940be0248d56 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Fri, 25 May 2012 15:45:13 +0200 Subject: [PATCH] Tag as LongRunningTest --- .../multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala | 6 +++--- .../scala/akka/cluster/MembershipChangeListenerSpec.scala | 7 +++---- .../multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala | 4 ++-- .../src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala index c15af5e651..4bbe703405 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/JoinTwoClustersSpec.scala @@ -8,7 +8,7 @@ import org.scalatest.BeforeAndAfter import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit.ImplicitSender +import akka.testkit._ object JoinTwoClustersMultiJvmSpec extends MultiNodeConfig { val a1 = role("a1") @@ -44,7 +44,7 @@ abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvm "Three different clusters (A, B and C)" must { - "be able to 'elect' a single leader after joining (A -> B)" in { + "be able to 'elect' a single leader after joining (A -> B)" taggedAs LongRunningTest in { runOn(a1, a2) { cluster.join(a1Address) @@ -75,7 +75,7 @@ abstract class JoinTwoClustersSpec extends MultiNodeSpec(JoinTwoClustersMultiJvm } - "be able to 'elect' a single leader after joining (C -> A + B)" in { + "be able to 'elect' a single leader after joining (C -> A + B)" taggedAs LongRunningTest in { runOn(b2) { cluster.join(c1Address) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerSpec.scala index 844d2803a1..64019c102c 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MembershipChangeListenerSpec.scala @@ -8,8 +8,7 @@ import org.scalatest.BeforeAndAfter import com.typesafe.config.ConfigFactory import akka.remote.testkit.MultiNodeConfig import akka.remote.testkit.MultiNodeSpec -import akka.testkit.ImplicitSender -import akka.testkit.TestLatch +import akka.testkit._ object MembershipChangeListenerMultiJvmSpec extends MultiNodeConfig { val first = role("first") @@ -39,7 +38,7 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan val firstAddress = node(first).address val secondAddress = node(second).address - "(when two systems) after cluster convergence updates the membership table then all MembershipChangeListeners should be triggered" in { + "(when two systems) after cluster convergence updates the membership table then all MembershipChangeListeners should be triggered" taggedAs LongRunningTest in { runOn(first, second) { cluster.join(firstAddress) @@ -56,7 +55,7 @@ abstract class MembershipChangeListenerSpec extends MultiNodeSpec(MembershipChan } - "(when three systems) after cluster convergence updates the membership table then all MembershipChangeListeners should be triggered" in { + "(when three systems) after cluster convergence updates the membership table then all MembershipChangeListeners should be triggered" taggedAs LongRunningTest in { runOn(third) { cluster.join(firstAddress) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala index b5dc5d4d42..f96265ac5a 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala @@ -37,7 +37,7 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp "A set of connected cluster systems" must { - "(when two systems) start gossiping to each other so that both systems gets the same gossip info" in { + "(when two systems) start gossiping to each other so that both systems gets the same gossip info" taggedAs LongRunningTest in { runOn(first, second) { cluster.join(firstAddress) @@ -51,7 +51,7 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp } - "(when three systems) start gossiping to each other so that both systems gets the same gossip info" in { + "(when three systems) start gossiping to each other so that both systems gets the same gossip info" taggedAs LongRunningTest in { runOn(third) { cluster.join(firstAddress) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala index 55a0b15f63..65cd7891a9 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala @@ -34,7 +34,7 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi "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 { + "be a singleton cluster when started up" taggedAs LongRunningTest in { runOn(first) { awaitCond(cluster.isSingletonCluster) // FIXME #2117 singletonCluster should reach convergence @@ -42,7 +42,7 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi } } - "be in 'Joining' phase when started up" in { + "be in 'Joining' phase when started up" taggedAs LongRunningTest in { runOn(first) { val members = cluster.latestGossip.members members.size must be(1) @@ -55,7 +55,7 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi } "A second cluster node" must { - "join the other node cluster when sending a Join command" in { + "join the other node cluster when sending a Join command" taggedAs LongRunningTest in { runOn(second) { cluster.join(firstAddress)