x/vmware-nsx
Code Issues Proposed changes

Merge "ofa_test_base: Fix NoSuchOptError in UT"

Browse Source
This commit is contained in:
Jenkins 2014-12-16 06:27:31 +00:00 committed by Gerrit Code Review
commit fd4d55c910
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/base.py
View File

@ -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.

1
neutron/tests/unit/ofagent/ofa_test_base.py
View File

@ -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()

2
neutron/tests/unit/test_db_plugin.py
View File

@ -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):