diff options
Diffstat (limited to 'heat/tests/engine')
| -rw-r--r-- | heat/tests/engine/test_check_resource.py | 1 | ||||
| -rw-r--r-- | heat/tests/engine/tools.py | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/heat/tests/engine/test_check_resource.py b/heat/tests/engine/test_check_resource.py index 5d8054df5..0e8a533b3 100644 --- a/heat/tests/engine/test_check_resource.py +++ b/heat/tests/engine/test_check_resource.py @@ -547,6 +547,7 @@ class CheckWorkflowCleanupTest(common.HeatTestCase): template=tools.string_template_five, convergence=True) tstack.converge_stack(tstack.t, action=tstack.CREATE) self.stack = stack.Stack.load(self.ctx, stack_id=tstack.id) + self.stack.thread_group_mgr = tools.DummyThreadGroupManager() self.stack.converge_stack(self.stack.t, action=self.stack.DELETE) self.resource = self.stack['A'] self.is_update = False diff --git a/heat/tests/engine/tools.py b/heat/tests/engine/tools.py index d62df271d..08c12e733 100644 --- a/heat/tests/engine/tools.py +++ b/heat/tests/engine/tools.py @@ -164,6 +164,7 @@ def get_stack(stack_name, ctx, template=None, with_params=True, tmpl = templatem.Template(t) stack = parser.Stack(ctx, stack_name, tmpl, convergence=convergence, **kwargs) + stack.thread_group_mgr = DummyThreadGroupManager() return stack @@ -323,6 +324,11 @@ class DummyThreadGroupManager(object): self.msg_queues = [] self.messages = [] + def start(self, stack, func, *args, **kwargs): + # Just run the function, so we know it's completed in the test + func(*args, **kwargs) + return DummyThread() + def start_with_lock(self, cnxt, stack, engine_id, func, *args, **kwargs): # Just run the function, so we know it's completed in the test func(*args, **kwargs) |