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

Merge pull request #1911 from akka/wip-3801-ReliableProxySpec-dilated-patriknw

Browse source 
=con #3801 No dilation of expectNoMsg in ReliableProxySpec
This commit is contained in:
Patrik Nordwall 2014-01-15 10:30:41 -08:00
commit 7ded992a5c
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
akka-contrib/src/multi-jvm/scala/akka/contrib/pattern/ReliableProxySpec.scala
View file

@ -17,6 +17,7 @@ import akka.testkit.ImplicitSender
import scala.concurrent.duration._
import akka.actor.FSM
import akka.actor.ActorRef
import akka.testkit.TestKitExtension
import akka.testkit.TestProbe
import akka.actor.ActorIdentity
import akka.actor.Identify
@ -49,10 +50,18 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
def expectState(s: State) = expectMsg(FSM.CurrentState(proxy, s))
def expectTransition(s1: State, s2: State) = expectMsg(FSM.Transition(proxy, s1, s2))
def expectTransition(max: FiniteDuration, s1: State, s2: State) = expectMsg(max, FSM.Transition(proxy, s1, s2))
def sendN(n: Int) = (1 to n) foreach (proxy ! _)
def expectN(n: Int) = (1 to n) foreach { n ⇒ expectMsg(n); lastSender should equal(target) }
// avoid too long timeout for expectNoMsg when using dilated timeouts, because
// blackhole will trigger failure detection
val expectNoMsgTimeout = {
val timeFactor = TestKitExtension(system).TestTimeFactor
if (timeFactor > 1.0) (1.0 / timeFactor).seconds else 1.second
}
"A ReliableProxy" must {
"initialize properly" in {
@ -118,10 +127,8 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
runOn(local) {
testConductor.blackhole(local, remote, Direction.Send).await
sendN(100)
within(1 second) {
expectTransition(Idle, Active)
expectNoMsg
}
expectTransition(1 second, Idle, Active)
expectNoMsg(expectNoMsgTimeout)
}
enterBarrier("test2a")
@ -134,7 +141,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
runOn(local) {
testConductor.passThrough(local, remote, Direction.Send).await
within(5 seconds) { expectTransition(Active, Idle) }
expectTransition(5 seconds, Active, Idle)
}
runOn(remote) {
within(1 second) {
@ -149,10 +156,8 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
runOn(local) {
testConductor.blackhole(local, remote, Direction.Receive).await
sendN(100)
within(1 second) {
expectTransition(Idle, Active)
expectNoMsg
}
expectTransition(1 second, Idle, Active)
expectNoMsg(expectNoMsgTimeout)
}
runOn(remote) {
within(1 second) {
@ -164,7 +169,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
runOn(local) {
testConductor.passThrough(local, remote, Direction.Receive).await
within(5 seconds) { expectTransition(Active, Idle) }
expectTransition(5 seconds, Active, Idle)
}
enterBarrier("test3b")
@ -189,7 +194,7 @@ class ReliableProxySpec extends MultiNodeSpec(ReliableProxySpec) with STMultiNod
within(5 seconds) {
expectN(50)
}
expectNoMsg(1 second)
expectNoMsg(expectNoMsgTimeout)
}
enterBarrier("test4")