openstack
/
neutron
Code Issues Proposed changes

Avoid DuplicateOptError in functional tests 

Some test require to register options with oslo.Config,
but now some of them use global cfg.CONF for it.
This can cause the DuplicateOptError if two tests tried to
register the same option with different values of config.
We should use the oslo_config fixture [1]
in functional tests to avoid it.

[1] http://git.openstack.org/cgit/openstack/oslo.config/tree/oslo_config/fixture.py

Closes-bug: #1505715
Change-Id: I5c2340c0af054dfa78788cbc61dfb1fd9feea535
This commit is contained in:
Sergey Belous 2015-10-13 17:50:05 +03:00
parent 8a7391f00f
commit 5c3f5d0350
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/functional/agent/l3/test_keepalived_state_change.py
View File

@ -16,6 +16,7 @@ import os
import mock
from oslo_config import cfg
from oslo_config import fixture as fixture_config
from oslo_utils import uuidutils
from neutron.agent.l3 import keepalived_state_change
@ -25,7 +26,8 @@ from neutron.tests.functional import base
class TestKeepalivedStateChange(base.BaseSudoTestCase):
def setUp(self):
super(TestKeepalivedStateChange, self).setUp()
cfg.CONF.register_opt(
self.conf_fixture = self.useFixture(fixture_config.Config())
self.conf_fixture.register_opt(
cfg.StrOpt('metadata_proxy_socket',
default='$state_path/metadata_proxy',
help=_('Location of Metadata Proxy UNIX domain '