openstack
/
heat
Code Issues Proposed changes

Merge "Always call TaskRunner._sleep()"

This commit is contained in:
Jenkins 2016-07-20 14:16:59 +00:00 committed by Gerrit Code Review
parent ce4c7cc7ce 1de87a9b36
commit c9c29d5f23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/scheduler.py
View File

@ -166,8 +166,8 @@ class TaskRunner(object):
self.start(timeout=timeout) self.start(timeout=timeout)
# ensure that zero second sleep is applied only if task # ensure that zero second sleep is applied only if task
# has not completed. # has not completed.
if not self.done() and wait_time: if not self.done():
self._sleep(0) self._sleep(0 if wait_time is not None else None)
self.run_to_completion(wait_time=wait_time) self.run_to_completion(wait_time=wait_time)
def start(self, timeout=None): def start(self, timeout=None):
@ -420,6 +420,7 @@ class DependencyTaskGroup(object):
if not r: if not r:
del self._graph[k] del self._graph[k]
if self._graph:
yield yield
for k, r in self._running(): for k, r in self._running():

2
heat/tests/test_stack_update.py
View File

@ -854,7 +854,7 @@ class StackUpdateTest(common.HeatTestCase):
tmpl2 = {'HeatTemplateFormatVersion': '2012-12-12', tmpl2 = {'HeatTemplateFormatVersion': '2012-12-12',
'Resources': { 'Resources': {
'AResource': {'Type': 'GenericResourceType'}, 'AResource': {'Type': 'GenericResourceType'},
'BResource': {'Type': 'GenericResourceType'}}} 'BResource': {'Type': 'MultiStepResourceType'}}}
updated_stack = stack.Stack(self.ctx, 'updated_stack', updated_stack = stack.Stack(self.ctx, 'updated_stack',
template.Template(tmpl2), template.Template(tmpl2),
disable_rollback=disable_rollback) disable_rollback=disable_rollback)