Merge "Patch _get_callback_manager for callback fixture"

This commit is contained in:
Jenkins 2017-04-28 17:55:23 +00:00 committed by Gerrit Code Review
commit 449f079b33
1 changed files with 8 additions and 2 deletions

View File

@ -12,6 +12,7 @@
import copy
import fixtures
import mock
from neutron_lib.api import attributes
from neutron_lib.api import definitions
@ -56,14 +57,19 @@ class CallbackRegistryFixture(fixtures.Fixture):
"""
super(CallbackRegistryFixture, self).__init__()
self.callback_manager = callback_manager or manager.CallbacksManager()
self.patcher = None
def _setUp(self):
self._orig_manager = registry._CALLBACK_MANAGER
registry._CALLBACK_MANAGER = self.callback_manager
self._orig_manager = registry._get_callback_manager()
self.patcher = mock.patch.object(
registry, '_get_callback_manager',
return_value=self.callback_manager)
self.patcher.start()
self.addCleanup(self._restore)
def _restore(self):
registry._CALLBACK_MANAGER = self._orig_manager
self.patcher.stop()
class SqlFixture(fixtures.Fixture):