From 511ecff930d62bd4525a854cd79f332376cf057f Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 8 Sep 2021 10:23:22 +0200 Subject: [PATCH] Harden ConsumerControllerSpec, #30430 (#30655) --- .../actor/typed/delivery/ConsumerControllerSpec.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala index 5afcc226d0..a01ac93698 100644 --- a/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala +++ b/akka-actor-typed-tests/src/test/scala/akka/actor/typed/delivery/ConsumerControllerSpec.scala @@ -14,7 +14,6 @@ import akka.actor.typed.delivery.ConsumerController.DeliverThenStop import akka.actor.typed.delivery.internal.ConsumerControllerImpl import akka.actor.typed.delivery.internal.ProducerControllerImpl import akka.serialization.SerializationExtension -import akka.testkit.GHExcludeTest class ConsumerControllerSpec extends ScalaTestWithActorTestKit(ConfigFactory.parseString(""" @@ -473,8 +472,7 @@ class ConsumerControllerSpec testKit.stop(consumerController) } - // Excluded fo GHActions. See https://github.com/akka/akka/issues/30430 - "send Ack when stopped" taggedAs GHExcludeTest in { + "send Ack when stopped" in { nextId() val consumerController = spawn(ConsumerController[TestConsumer.Job](), s"consumerController-${idCount}") @@ -495,6 +493,11 @@ class ConsumerControllerSpec consumerProbe1.expectMessageType[ConsumerController.Delivery[TestConsumer.Job]] consumerController ! ConsumerController.Confirmed + consumerController ! sequencedMessage(producerId, 3, producerControllerProbe.ref) + consumerProbe1.expectMessageType[ConsumerController.Delivery[TestConsumer.Job]] + + // now we know that the ConsumerController has received Confirmed for 2, + // and 3 is still not confirmed testKit.stop(consumerController) producerControllerProbe.expectMessage(ProducerControllerImpl.Ack(2L)) }