Merge "Change catch type for workflow unregister"
This commit is contained in:
commit
6502a41d12
|
@ -18,6 +18,7 @@ import mock
|
|||
|
||||
import six
|
||||
|
||||
from horizon import base
|
||||
from horizon import exceptions
|
||||
from horizon.test import helpers as test
|
||||
from horizon import workflows
|
||||
|
@ -335,6 +336,10 @@ class WorkflowsTests(test.TestCase):
|
|||
'<TestStepThree: test_action_three>',
|
||||
'<TestStepTwo: test_action_two>'])
|
||||
|
||||
def test_workflow_unregister_unexisting_workflow(self):
|
||||
with self.assertRaises(base.NotRegistered):
|
||||
TestWorkflow.unregister(TestDisabledStep)
|
||||
|
||||
def test_workflow_render(self):
|
||||
TestWorkflow.register(TestStepThree)
|
||||
req = self.factory.get("/foo")
|
||||
|
|
|
@ -810,7 +810,7 @@ class Workflow(html.HTMLElement):
|
|||
"""Unregisters a :class:`~horizon.workflows.Step` from the workflow."""
|
||||
try:
|
||||
cls._cls_registry.remove(step_class)
|
||||
except KeyError:
|
||||
except ValueError:
|
||||
raise base.NotRegistered('%s is not registered' % cls)
|
||||
return cls._unregister(step_class)
|
||||
|
||||
|
|
Loading…
Reference in New Issue