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

fix race condition in MessageAdapterSpec, #29044

Browse source 
* if FunctionRef is stopped first, which is probably the most common case
  the message will be redirected as is to deadLetters
* otherwise the wrapped message is sent to deadLetters
This commit is contained in:
Patrik Nordwall 2020-05-08 09:44:06 +02:00
parent a66aaa089d
commit 0060794586
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/MessageAdapterSpec.scala
View file

@ -6,7 +6,6 @@ package akka.actor.typed.scaladsl
import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigFactory
import org.scalatest.wordspec.AnyWordSpecLike import org.scalatest.wordspec.AnyWordSpecLike
import org.slf4j.event.Level
import akka.actor.testkit.typed.TestException import akka.actor.testkit.typed.TestException
import akka.actor.testkit.typed.scaladsl.LogCapturing import akka.actor.testkit.typed.scaladsl.LogCapturing
@ -17,6 +16,7 @@ import akka.actor.typed.ActorRef
import akka.actor.typed.Behavior import akka.actor.typed.Behavior
import akka.actor.typed.PostStop import akka.actor.typed.PostStop
import akka.actor.typed.Props import akka.actor.typed.Props
import akka.actor.typed.internal.AdaptMessage
object MessageAdapterSpec { object MessageAdapterSpec {
val config = ConfigFactory.parseString(""" val config = ConfigFactory.parseString("""
@ -271,13 +271,15 @@ class MessageAdapterSpec
} }
"log wrapped message of DeadLetter" in { "redirect to DeadLetter after termination" in {
case class Ping(sender: ActorRef[Pong]) case class Ping(sender: ActorRef[Pong])
case class Pong(greeting: String) case class Pong(greeting: String)
case class PingReply(response: Pong) case class PingReply(response: Pong)
val pingProbe = createTestProbe[Ping]() val pingProbe = createTestProbe[Ping]()
val deadLetterProbe = testKit.createDeadLetterProbe()
val snitch = Behaviors.setup[PingReply] { context => val snitch = Behaviors.setup[PingReply] { context =>
val replyTo = context.messageAdapter[Pong](PingReply) val replyTo = context.messageAdapter[Pong](PingReply)
pingProbe.ref ! Ping(replyTo) pingProbe.ref ! Ping(replyTo)
@ -287,13 +289,13 @@ class MessageAdapterSpec
createTestProbe().expectTerminated(ref) createTestProbe().expectTerminated(ref)
LoggingTestKit.empty pingProbe.receiveMessage().sender ! Pong("hi")
.withLogLevel(Level.INFO) val deadLetter = deadLetterProbe.receiveMessage()
.withMessageRegex("Pong.*wrapped in.*AdaptMessage.*dead letters encountered") deadLetter.message match {
.expect { case AdaptMessage(Pong("hi"), _) => // passed through the FunctionRef
pingProbe.receiveMessage().sender ! Pong("hi") case Pong("hi") => // FunctionRef stopped
} case unexpected => fail(s"Unexpected message [$unexpected], expected Pong or AdaptMessage(Pong)")
}
} }
} }