openstack/heat
Code Issues Proposed changes

Remove spurious tracebacks from tests

Browse Source 
Some tests were deleting stacks in the background, thus provoking
tracebacks displayed later on during tests run. The patch waits for the
delete threads to prevent that.

Closes-Bug: #1278836
Closes-Bug: #1278937
Change-Id: I4b90eb6f90168803445039f9588a3052def6636a
This commit is contained in:
Thomas Herve 2014-02-11 17:50:13 +01:00
parent 2a2cf5231d
commit ed7710cd3b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/tests/test_engine_service.py
View File

@ -661,6 +661,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.m.ReplayAll()
self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier()))
self.man.thread_group_mgr.groups[sid].wait()
self.m.VerifyAll()
def test_stack_delete_nonexist(self):
@ -689,6 +690,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.m.ReplayAll()
self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier()))
self.man.thread_group_mgr.groups[sid].wait()
self.m.VerifyAll()
def test_stack_delete_current_engine_active_lock(self):
@ -711,6 +713,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.m.ReplayAll()
self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier()))
self.man.thread_group_mgr.groups[sid].wait()
self.m.VerifyAll()
def test_stack_delete_other_engine_active_lock_failed(self):
@ -767,6 +770,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.m.ReplayAll()
self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier()))
self.man.thread_group_mgr.groups[sid].wait()
self.m.VerifyAll()
def test_stack_update(self):
@ -906,6 +910,7 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
old_stack['A'].properties['Foo'])
self.assertEqual(create_stack['A'].id, old_stack['A'].id)
self.man.thread_group_mgr.groups[sid].wait()
self.m.VerifyAll()