openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Use 'addCleanup' instead of 'tearDown' in engine(s) test"

Browse Source
This commit is contained in:
Jenkins
2016-02-03 21:14:06 +00:00
committed by Gerrit Code Review
parent 6a48709d76 5de13ea44a
commit 48c4187a2e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taskflow/tests/unit/test_engines.py
View File

@@ -1505,14 +1505,15 @@ class WorkerBasedEngineTest(EngineTaskTest,
self.worker_thread = tu.daemon_thread(self.worker.run) self.worker_thread = tu.daemon_thread(self.worker.run)
self.worker_thread.start() self.worker_thread.start()
# Ensure worker and thread is stopped when test is done; these are
# called in reverse order, so make sure we signal the stop before
# performing the join (because the reverse won't work).
self.addCleanup(self.worker_thread.join)
self.addCleanup(self.worker.stop)
# Make sure the worker is started before we can continue... # Make sure the worker is started before we can continue...
self.worker.wait() self.worker.wait()
def tearDown(self):
self.worker.stop()
self.worker_thread.join()
super(WorkerBasedEngineTest, self).tearDown()
def _make_engine(self, flow, def _make_engine(self, flow,
flow_detail=None, store=None, **kwargs): flow_detail=None, store=None, **kwargs):
kwargs.update(self.engine_conf) kwargs.update(self.engine_conf)