Merge "Avoid DuplicateOptError in functional tests"

This commit is contained in:
Jenkins 2015-10-14 01:21:02 +00:00 committed by Gerrit Code Review
commit cecf2a5883

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 '