Merge "Updated the retries_remain statement"

This commit is contained in:
Jenkins 2016-11-29 09:07:34 +00:00 committed by Gerrit Code Review
commit cbe881ef7e
3 changed files with 7 additions and 7 deletions

View File

@ -334,7 +334,7 @@ class RetryPolicy(base.TaskPolicy):
retry_no = policy_context['retry_no']
del policy_context['retry_no']
retries_remain = retry_no + 1 < self.count
retries_remain = retry_no < self.count
stop_continue_flag = (
task_ex.state == states.SUCCESS and

View File

@ -553,7 +553,7 @@ class PoliciesTest(base.EngineTestCase):
task_ex = wf_ex.task_executions[0]
self.assertEqual(
2,
3,
task_ex.runtime_context["retry_task_policy"]["retry_no"]
)
@ -701,7 +701,7 @@ class PoliciesTest(base.EngineTestCase):
task_ex = wf_ex.task_executions[0]
self.assertEqual(
2,
3,
task_ex.runtime_context['retry_task_policy']['retry_no']
)
@ -824,7 +824,7 @@ class PoliciesTest(base.EngineTestCase):
task_ex = wf_ex.task_executions[0]
self.assertEqual(
2,
3,
task_ex.runtime_context['retry_task_policy']['retry_no']
)
@ -869,7 +869,7 @@ class PoliciesTest(base.EngineTestCase):
task_ex = wf_ex.task_executions[0]
self.assertEqual(
2,
3,
task_ex.runtime_context['retry_task_policy']['retry_no']
)

View File

@ -1052,10 +1052,10 @@ class WithItemsEngineTest(base.EngineTestCase):
task1_executions = task1_ex.executions
self.assertEqual(
2,
3,
task1_ex.runtime_context['retry_task_policy']['retry_no']
)
self.assertEqual(9, len(task1_executions))
self.assertEqual(12, len(task1_executions))
self._assert_multiple_items(task1_executions, 3, accepted=True)
@testtools.skip('Restore concurrency support.')