summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-01 13:11:25 +0000
committerGerrit Code Review <review@openstack.org>2014-12-01 13:11:25 +0000
commitba8c8d4665cc50aba36f230c97b1203abc2dddf7 (patch)
tree1776f72aa52f432f32872277c21594645a6b9c8a
parent5ff5d335e4e815b32639ab4b725d47150804b55f (diff)
parent30a5b12eb4cbf71711da376f90e2383eae4cdae1 (diff)
downloadoslo-messaging-ba8c8d4665cc50aba36f230c97b1203abc2dddf7.tar.gz
Merge "Wait for expected messages in listener pool test"
-rw-r--r--tests/notify/test_listener.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/notify/test_listener.py b/tests/notify/test_listener.py
index 00377b0..45bdbec 100644
--- a/tests/notify/test_listener.py
+++ b/tests/notify/test_listener.py
@@ -62,6 +62,10 @@ class ListenerSetupMixin(object):
if self._expect_messages == self._received_msgs:
self.stop()
+ def wait_for(self, expect_messages):
+ while expect_messages != self._received_msgs:
+ pass
+
def stop(self):
for listener in self.listeners:
# Check start() does nothing with a running listener
@@ -351,6 +355,7 @@ class TestNotifyListener(test_utils.BaseTestCase, ListenerSetupMixin):
'test message%d' % i)
mocked_endpoint1_calls.append(mocked_endpoint_call(i))
+ self.trackers['pool2'].wait_for(25)
listener2_thread.stop()
for i in range(0, 25):
@@ -358,6 +363,7 @@ class TestNotifyListener(test_utils.BaseTestCase, ListenerSetupMixin):
'test message%d' % i)
mocked_endpoint1_calls.append(mocked_endpoint_call(i))
+ self.trackers['pool2'].wait_for(50)
listener2_thread.start()
listener3_thread.stop()
@@ -366,6 +372,7 @@ class TestNotifyListener(test_utils.BaseTestCase, ListenerSetupMixin):
'test message%d' % i)
mocked_endpoint1_calls.append(mocked_endpoint_call(i))
+ self.trackers['pool2'].wait_for(75)
listener3_thread.start()
for i in range(0, 25):