test_duplicate_pipelines messages are also unordered
We also need to account for unordered messages to assert against.
Change-Id: Id8bf3442055c145cc1fdbe73b6b0aec63a181432
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index ff6cbf9..38ca4c5 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -4612,13 +4612,20 @@
self.assertEqual(len(A.messages), 2)
- self.assertIn('dup1', A.messages[0])
- self.assertNotIn('dup2', A.messages[0])
- self.assertIn('project-test1', A.messages[0])
-
- self.assertIn('dup2', A.messages[1])
- self.assertNotIn('dup1', A.messages[1])
- self.assertIn('project-test1', A.messages[1])
+ if 'dup1' in A.messages[0]:
+ self.assertIn('dup1', A.messages[0])
+ self.assertNotIn('dup2', A.messages[0])
+ self.assertIn('project-test1', A.messages[0])
+ self.assertIn('dup2', A.messages[1])
+ self.assertNotIn('dup1', A.messages[1])
+ self.assertIn('project-test1', A.messages[1])
+ else:
+ self.assertIn('dup1', A.messages[1])
+ self.assertNotIn('dup2', A.messages[1])
+ self.assertIn('project-test1', A.messages[1])
+ self.assertIn('dup2', A.messages[0])
+ self.assertNotIn('dup1', A.messages[0])
+ self.assertIn('project-test1', A.messages[0])
class TestSchedulerOneJobProject(ZuulTestCase):