openstack/deb-heat
Code Issues Proposed changes

Merge "test_engine_service remove redundant DummyThreadGroups"

Browse Source
This commit is contained in:
Jenkins 2014-05-30 22:37:02 +00:00 committed by Gerrit Code Review
commit 61bd5f30f2
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/tests/test_engine_service.py
View File

@ -658,9 +658,6 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
self.m.StubOutWithMock(parser.Stack, 'load') self.m.StubOutWithMock(parser.Stack, 'load')
parser.Stack.load(self.ctx, stack=s).AndReturn(stack) parser.Stack.load(self.ctx, stack=s).AndReturn(stack)
self.man.tg = DummyThreadGroup()
self.m.ReplayAll() self.m.ReplayAll()
self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier())) self.assertIsNone(self.man.delete_stack(self.ctx, stack.identifier()))
@ -687,7 +684,6 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
st = db_api.stack_get(self.ctx, sid) st = db_api.stack_get(self.ctx, sid)
self.m.StubOutWithMock(parser.Stack, 'load') self.m.StubOutWithMock(parser.Stack, 'load')
parser.Stack.load(self.ctx, stack=st).MultipleTimes().AndReturn(stack) parser.Stack.load(self.ctx, stack=st).MultipleTimes().AndReturn(stack)
self.man.tg = DummyThreadGroup()
self.m.StubOutWithMock(stack_lock.StackLock, 'try_acquire') self.m.StubOutWithMock(stack_lock.StackLock, 'try_acquire')
stack_lock.StackLock.try_acquire().AndReturn(self.man.engine_id) stack_lock.StackLock.try_acquire().AndReturn(self.man.engine_id)
@ -705,7 +701,6 @@ class StackServiceCreateUpdateDeleteTest(HeatTestCase):
st = db_api.stack_get(self.ctx, sid) st = db_api.stack_get(self.ctx, sid)
self.m.StubOutWithMock(parser.Stack, 'load') self.m.StubOutWithMock(parser.Stack, 'load')
parser.Stack.load(self.ctx, stack=st).MultipleTimes().AndReturn(stack) parser.Stack.load(self.ctx, stack=st).MultipleTimes().AndReturn(stack)
self.man.tg = DummyThreadGroup()
self.m.StubOutWithMock(stack_lock.StackLock, 'try_acquire') self.m.StubOutWithMock(stack_lock.StackLock, 'try_acquire')
stack_lock.StackLock.try_acquire().AndReturn(self.man.engine_id) stack_lock.StackLock.try_acquire().AndReturn(self.man.engine_id)