diff --git a/neutron/tests/base.py b/neutron/tests/base.py index 56678fe7b5..a39397c281 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -118,9 +118,9 @@ class BaseTestCase(sub_base.SubBaseTestCase): self.addCleanup(n_rpc.cleanup) n_rpc.init(CONF) - def setup_config(self): + def setup_config(self, args=None): """Tests that need a non-default config can override this method.""" - self.config_parse() + self.config_parse(args=args) def config(self, **kw): """Override some configuration values. diff --git a/neutron/tests/unit/ofagent/ofa_test_base.py b/neutron/tests/unit/ofagent/ofa_test_base.py index 60c03ce762..0ff9c43356 100644 --- a/neutron/tests/unit/ofagent/ofa_test_base.py +++ b/neutron/tests/unit/ofagent/ofa_test_base.py @@ -69,3 +69,4 @@ class OFAAgentTestBase(OFATestBase): help='openflow tcp listen port') ]) cfg.CONF.set_override('root_helper', 'fake_helper', group='AGENT') + super(OFATestBase, self).setup_config() diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py index 56868fcfd6..6d2dd8c752 100644 --- a/neutron/tests/unit/test_db_plugin.py +++ b/neutron/tests/unit/test_db_plugin.py @@ -155,7 +155,7 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase, # If test_config specifies some config-file, use it, as well for config_file in test_lib.test_config.get('config_files', []): args.extend(['--config-file', config_file]) - self.config_parse(args=args) + super(NeutronDbPluginV2TestCase, self).setup_config(args=args) def _req(self, method, resource, data=None, fmt=None, id=None, params=None, action=None, subresource=None, sub_id=None, context=None):