openstack/neutron
Code Issues Proposed changes

Merge "Provide kwargs for callback abort"

Browse Source
This commit is contained in:
Jenkins
2016-01-15 19:23:18 +00:00
committed by Gerrit Code Review
parent 831c2da944 8771ab4816
commit 4f09f2a139
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/callbacks/manager.py
View File

@@ -119,7 +119,7 @@ class CallbacksManager(object):
if errors and event.startswith(events.BEFORE):
abort_event = event.replace(
events.BEFORE, events.ABORT)
self._notify_loop(resource, abort_event, trigger)
self._notify_loop(resource, abort_event, trigger, **kwargs)
raise exceptions.CallbackFailure(errors=errors)
def clear(self):

9
neutron/tests/unit/callbacks/test_manager.py
View File

@@ -149,10 +149,13 @@ class CallBacksManagerTestCase(base.BaseTestCase):
n.return_value = ['error']
self.assertRaises(exceptions.CallbackFailure,
self.manager.notify,
mock.ANY, events.BEFORE_CREATE, mock.ANY)
mock.ANY, events.BEFORE_CREATE,
'trigger', params={'a': 1})
expected_calls = [
mock.call(mock.ANY, 'before_create', mock.ANY),
mock.call(mock.ANY, 'abort_create', mock.ANY)
mock.call(mock.ANY, 'before_create',
'trigger', params={'a': 1}),
mock.call(mock.ANY, 'abort_create',
'trigger', params={'a': 1})
]
n.assert_has_calls(expected_calls)