Merge "Use the full 'get_execute_failures' vs the shortname"
This commit is contained in:
@@ -332,12 +332,12 @@ class ActionEngine(base.Engine):
|
|||||||
if new_state not in self.IGNORABLE_STATES:
|
if new_state not in self.IGNORABLE_STATES:
|
||||||
self._change_state(new_state)
|
self._change_state(new_state)
|
||||||
if new_state not in self.NO_RERAISING_STATES:
|
if new_state not in self.NO_RERAISING_STATES:
|
||||||
failures = self.storage.get_failures()
|
e_failures = self.storage.get_execute_failures()
|
||||||
more_failures = self.storage.get_revert_failures()
|
r_failures = self.storage.get_revert_failures()
|
||||||
fails = itertools.chain(
|
er_failures = itertools.chain(
|
||||||
six.itervalues(failures),
|
six.itervalues(e_failures),
|
||||||
six.itervalues(more_failures))
|
six.itervalues(r_failures))
|
||||||
failure.Failure.reraise_if_any(fails)
|
failure.Failure.reraise_if_any(er_failures)
|
||||||
finally:
|
finally:
|
||||||
if w is not None:
|
if w is not None:
|
||||||
w.stop()
|
w.stop()
|
||||||
|
|||||||
Reference in New Issue
Block a user