openstack
/
neutron
Code Issues Proposed changes

Merge "ExtensionTestCase: register correct core plugin"

changes/25/451225/1
Jenkins 2017-03-29 06:51:10 +00:00 committed by Gerrit Code Review
parent fd041d6471 bae6555816
commit b73be21678
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/extensions/base.py
View File

@ -32,6 +32,9 @@ from neutron.tests.unit.api.v2 import test_base
from neutron.tests.unit import testlib_api
CORE_PLUGIN = 'neutron.db.db_base_plugin_v2.NeutronDbPluginV2'
class ExtensionTestCase(testlib_api.WebTestCase):
def _setUpExtension(self, plugin, service_type,
@ -55,9 +58,8 @@ class ExtensionTestCase(testlib_api.WebTestCase):
# Create the default configurations
self.config_parse()
# just stubbing core plugin with plugin
self.setup_coreplugin(plugin, load_plugins=False)
cfg.CONF.set_override('core_plugin', plugin)
core_plugin = CORE_PLUGIN if service_type else plugin
self.setup_coreplugin(core_plugin, load_plugins=False)
if service_type:
cfg.CONF.set_override('service_plugins', [plugin])