openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Increase usefulness of the retry component compile errors"

Browse Source
This commit is contained in:
Jenkins
2014-06-29 22:27:45 +00:00
committed by Gerrit Code Review
parent 07bdc889ff 7c7e52351b
commit a17a546896
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
taskflow/engines/action_engine/compiler.py
View File

@@ -110,8 +110,18 @@ class _Flattener(object):
elif isinstance(item, task.BaseTask):
return self._flatten_task
elif isinstance(item, retry.Retry):
raise TypeError("Retry controller %s (%s) is used not as a flow "
"parameter" % (item, type(item)))
if len(self._history) == 1:
raise TypeError("Retry controller: %s (%s) must only be used"
" as a flow constructor parameter and not as a"
" root component" % (item, type(item)))
else:
# TODO(harlowja): we should raise this type error earlier
# instead of later since we should do this same check on add()
# calls, this makes the error more visible (instead of waiting
# until compile time).
raise TypeError("Retry controller: %s (%s) must only be used"
" as a flow constructor parameter and not as a"
" flow added component" % (item, type(item)))
else:
return None

2
taskflow/tests/unit/test_action_engine_compile.py
View File

@@ -46,7 +46,7 @@ class PatternCompileTest(test.TestCase):
def test_retry(self):
r = retry.AlwaysRevert('r1')
msg_regex = "^Retry controller .* is used not as a flow parameter"
msg_regex = "^Retry controller: .* must only be used .*"
self.assertRaisesRegexp(TypeError, msg_regex,
compiler.PatternCompiler().compile, r)