openstack/oslo.messaging
Code Issues Proposed changes

Merge "Avoid sending cast after server shutdown in functional test"

Browse Source
This commit is contained in:
Jenkins 2016-08-28 19:12:43 +00:00 committed by Gerrit Code Review
commit 661b12604f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslo_messaging/tests/functional/utils.py
View File

@ -111,8 +111,9 @@ class RpcServerFixture(fixtures.Fixture):
def _stop(self):
self.thread.stop()
self._ctrl.cast({}, 'ping')
self.thread.join()
self.thread.join(timeout=30)
if self.thread.isAlive():
raise Exception("Server did not shutdown correctly")
def ping(self, ctxt):
pass
@ -355,8 +356,9 @@ class NotificationFixture(fixtures.Fixture):
def _stop(self):
self.thread.stop()
self._ctrl.sample({}, 'shutdown', 'shutdown')
self.thread.join()
self.thread.join(timeout=30)
if self.thread.isAlive():
raise Exception("Server did not shutdown properly")
def notifier(self, publisher, topic=None):
transport = self.useFixture(TransportFixture(self.conf, self.url))