x/vmware-nsx
Code Issues Proposed changes

Merge "Big Switch: Don't use MagicMocks unnecessarily"

Browse Source
This commit is contained in:
Jenkins 2014-06-13 02:44:00 +00:00 committed by Gerrit Code Review
commit 4114b71ba2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/tests/unit/bigswitch/test_base.py
View File

@ -28,6 +28,7 @@ from neutron.tests.unit.bigswitch import fake_server
RESTPROXY_PKG_PATH = 'neutron.plugins.bigswitch.plugin' RESTPROXY_PKG_PATH = 'neutron.plugins.bigswitch.plugin'
NOTIFIER = 'neutron.plugins.bigswitch.plugin.AgentNotifierApi' NOTIFIER = 'neutron.plugins.bigswitch.plugin.AgentNotifierApi'
CALLBACKS = 'neutron.plugins.bigswitch.plugin.RestProxyCallbacks' CALLBACKS = 'neutron.plugins.bigswitch.plugin.RestProxyCallbacks'
DISPATCHER = CALLBACKS + '.create_rpc_dispatcher'
CERTFETCH = 'neutron.plugins.bigswitch.servermanager.ServerPool._fetch_cert' CERTFETCH = 'neutron.plugins.bigswitch.servermanager.ServerPool._fetch_cert'
SERVER_MANAGER = 'neutron.plugins.bigswitch.servermanager' SERVER_MANAGER = 'neutron.plugins.bigswitch.servermanager'
HTTPCON = 'neutron.plugins.bigswitch.servermanager.httplib.HTTPConnection' HTTPCON = 'neutron.plugins.bigswitch.servermanager.httplib.HTTPConnection'
@ -54,9 +55,13 @@ class BigSwitchTestBase(object):
def setup_patches(self): def setup_patches(self):
self.plugin_notifier_p = mock.patch(NOTIFIER) self.plugin_notifier_p = mock.patch(NOTIFIER)
self.callbacks_p = mock.patch(CALLBACKS) # prevent rpc callback dispatcher from being created
self.spawn_p = mock.patch(SPAWN) self.callbacks_p = mock.patch(DISPATCHER,
self.watch_p = mock.patch(CWATCH) new=lambda *args, **kwargs: None)
# prevent any greenthreads from spawning
self.spawn_p = mock.patch(SPAWN, new=lambda *args, **kwargs: None)
# prevent the consistency watchdog from starting
self.watch_p = mock.patch(CWATCH, new=lambda *args, **kwargs: None)
self.addCleanup(db.clear_db) self.addCleanup(db.clear_db)
self.callbacks_p.start() self.callbacks_p.start()
self.plugin_notifier_p.start() self.plugin_notifier_p.start()