From bf714dd72a4ec5edd5a792092080e53c00ca1bd7 Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Wed, 5 Dec 2018 10:25:50 +0000
Subject: [PATCH] BackoffSupervisorSpec: Fix race of terminated messages
 (#25947)

---
 .../src/test/scala/akka/pattern/BackoffSupervisorSpec.scala | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
index ef21754a72..fe36e787b0 100644
--- a/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/pattern/BackoffSupervisorSpec.scala
@@ -330,8 +330,10 @@ class BackoffSupervisorSpec extends AkkaSpec with ImplicitSender with Eventually
         awaitAssert(c3 should !==(c2))
         watch(c3)
         c3 ! "boom"
-        expectTerminated(c3)
-        expectTerminated(supervisor)
+        withClue("Expected child and supervisor to terminate") {
+          Set(expectMsgType[Terminated].actor, expectMsgType[Terminated].actor) shouldEqual Set(c3, supervisor)
+        }
+
       }
     }
   }