Merge "Remove ordering assumption from functional test"

1 files changed, 9 insertions, 13 deletions

diff --git a/oslo_messaging/tests/functional/test_functional.py b/oslo_messaging/tests/functional/test_functional.py
index 9851a4c..8311648 100644
--- a/oslo_messaging/tests/functional/test_functional.py
+++ b/oslo_messaging/tests/functional/test_functional.py
@@ -297,19 +297,15 @@ class NotifyTestCase(utils.SkipIfNoTransportURL):
         for event_type, payload in b_out:
             b.info({}, event_type, payload)
 
-        for expected in a_out:
-            actual = listener_a.events.get(timeout=0.5)
-            self.assertEqual('info', actual[0])
-            self.assertEqual(expected[0], actual[1])
-            self.assertEqual(expected[1], actual[2])
-            self.assertEqual('pub-1', actual[3])
-
-        for expected in b_out:
-            actual = listener_b.events.get(timeout=0.5)
-            self.assertEqual('info', actual[0])
-            self.assertEqual(expected[0], actual[1])
-            self.assertEqual(expected[1], actual[2])
-            self.assertEqual('pub-2', actual[3])
+        def check_received(listener, publisher, messages):
+            actuals = sorted([listener.events.get(timeout=0.5)
+                              for __ in range(len(a_out))])
+            expected = sorted([['info', m[0], m[1], publisher]
+                               for m in messages])
+            self.assertEqual(expected, actuals)
+
+        check_received(listener_a, "pub-1", a_out)
+        check_received(listener_b, "pub-2", b_out)
 
     def test_all_categories(self):
         listener = self.useFixture(utils.NotificationFixture(