diff --git a/neutron/tests/base.py b/neutron/tests/base.py index f166bbba3d7..2f560ccbb3d 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -291,7 +291,6 @@ class BaseTestCase(DietTestCase): @staticmethod def config_parse(conf=None, args=None): """Create the default configurations.""" - # neutron.conf includes rpc_backend which needs to be cleaned up if args is None: args = [] args += ['--config-file', etcdir('neutron.conf')] diff --git a/neutron/tests/etc/neutron.conf b/neutron/tests/etc/neutron.conf index 798ff3e9f34..74d8bfe418b 100644 --- a/neutron/tests/etc/neutron.conf +++ b/neutron/tests/etc/neutron.conf @@ -14,8 +14,8 @@ bind_port = 9696 # Paste configuration file api_paste_config = api-paste.ini.test -# The messaging module to use, defaults to kombu. -rpc_backend = fake +# The messaging transport URL +transport_url = 'fake:/' lock_path = $state_path/lock