openstack/neutron
Code Issues Proposed changes

Merge "Update tests neutron.conf to use transport_url"

Browse Source
This commit is contained in:
Zuul 2018-10-05 15:01:07 +00:00 committed by Gerrit Code Review
commit 41f6560dd6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/tests/base.py
View File

@ -291,7 +291,6 @@ class BaseTestCase(DietTestCase):
@staticmethod @staticmethod
def config_parse(conf=None, args=None): def config_parse(conf=None, args=None):
"""Create the default configurations.""" """Create the default configurations."""
# neutron.conf includes rpc_backend which needs to be cleaned up
if args is None: if args is None:
args = [] args = []
args += ['--config-file', etcdir('neutron.conf')] args += ['--config-file', etcdir('neutron.conf')]

4
neutron/tests/etc/neutron.conf
View File

@ -14,8 +14,8 @@ bind_port = 9696
# Paste configuration file # Paste configuration file
api_paste_config = api-paste.ini.test api_paste_config = api-paste.ini.test
# The messaging module to use, defaults to kombu. # The messaging transport URL
rpc_backend = fake transport_url = 'fake:/'
lock_path = $state_path/lock lock_path = $state_path/lock