Merge "Correction of comments for the #539039 review"

This commit is contained in:
Zuul 2018-02-12 13:08:11 +00:00 committed by Gerrit Code Review
commit 90d2a94dd8
3 changed files with 5 additions and 5 deletions

View File

@ -57,8 +57,7 @@ def _process_queue(queue):
for operation, args in queue:
if operation == _RUN_ACTION:
action_ex, action_def, target, execution_context, \
timeout = args
action_ex, action_def, target, execution_context, timeout = args
executor.run_action(
action_ex.id,

View File

@ -28,8 +28,9 @@ import six
_CONTINUE_TASK_PATH = 'mistral.engine.policies._continue_task'
_COMPLETE_TASK_PATH = 'mistral.engine.policies._complete_task'
_FAIL_IF_INCOMPLETE_TASK_PATH = \
_FAIL_IF_INCOMPLETE_TASK_PATH = (
'mistral.engine.policies._fail_task_if_incomplete'
)
def _log_task_delay(task_ex, delay_sec):

View File

@ -1437,7 +1437,7 @@ class PoliciesTest(base.EngineTestCase):
self.await_workflow_error(wf_ex.id)
def test_action_timeout(self):
wb = """---
wf_text = """---
version: '2.0'
wf1:
tasks:
@ -1446,7 +1446,7 @@ class PoliciesTest(base.EngineTestCase):
timeout: 2
"""
wf_service.create_workflows(wb)
wf_service.create_workflows(wf_text)
wf_ex = self.engine.start_workflow('wf1')
with db_api.transaction():