Merge "Remove deprecated oslo.config messages." into stable/ocata
This commit is contained in:
commit
38ba0511e7
@ -388,8 +388,7 @@ class TestAlarms(TestAlarmsBase):
|
|||||||
|
|
||||||
def test_get_alarm_forbiden(self):
|
def test_get_alarm_forbiden(self):
|
||||||
pf = os.path.abspath('aodh/tests/functional/api/v2/policy.json-test')
|
pf = os.path.abspath('aodh/tests/functional/api/v2/policy.json-test')
|
||||||
self.CONF.set_override('policy_file', pf, group='oslo_policy',
|
self.CONF.set_override('policy_file', pf, group='oslo_policy')
|
||||||
enforce_type=True)
|
|
||||||
self.CONF.set_override('auth_mode', None, group='api')
|
self.CONF.set_override('auth_mode', None, group='api')
|
||||||
self.app = webtest.TestApp(app.load_app(self.CONF))
|
self.app = webtest.TestApp(app.load_app(self.CONF))
|
||||||
|
|
||||||
|
@ -93,8 +93,7 @@ class TestBase(test_base.BaseTestCase):
|
|||||||
|
|
||||||
conf = service.prepare_service(argv=[], config_files=[])
|
conf = service.prepare_service(argv=[], config_files=[])
|
||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
||||||
self.CONF.set_override('connection', db_url, group="database",
|
self.CONF.set_override('connection', db_url, group="database")
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
manager = self.DRIVER_MANAGERS.get(self.engine)
|
manager = self.DRIVER_MANAGERS.get(self.engine)
|
||||||
if not manager:
|
if not manager:
|
||||||
@ -105,7 +104,7 @@ class TestBase(test_base.BaseTestCase):
|
|||||||
self.useFixture(self.db_manager)
|
self.useFixture(self.db_manager)
|
||||||
|
|
||||||
self.CONF.set_override('connection', self.db_manager.url,
|
self.CONF.set_override('connection', self.db_manager.url,
|
||||||
group="database", enforce_type=True)
|
group="database")
|
||||||
|
|
||||||
self.alarm_conn = storage.get_connection_from_config(self.CONF)
|
self.alarm_conn = storage.get_connection_from_config(self.CONF)
|
||||||
self.alarm_conn.upgrade()
|
self.alarm_conn.upgrade()
|
||||||
|
@ -79,8 +79,7 @@ class ConfigFixture(fixture.GabbiFixture):
|
|||||||
conf.set_override('policy_file',
|
conf.set_override('policy_file',
|
||||||
os.path.abspath(
|
os.path.abspath(
|
||||||
'aodh/tests/open-policy.json'),
|
'aodh/tests/open-policy.json'),
|
||||||
group='oslo_policy',
|
group='oslo_policy')
|
||||||
enforce_type=True)
|
|
||||||
conf.set_override('auth_mode', None, group='api')
|
conf.set_override('auth_mode', None, group='api')
|
||||||
|
|
||||||
parsed_url = urlparse.urlparse(db_url)
|
parsed_url = urlparse.urlparse(db_url)
|
||||||
@ -89,8 +88,7 @@ class ConfigFixture(fixture.GabbiFixture):
|
|||||||
parsed_url[2] += '-%s' % uuidutils.generate_uuid(dashed=False)
|
parsed_url[2] += '-%s' % uuidutils.generate_uuid(dashed=False)
|
||||||
db_url = urlparse.urlunparse(parsed_url)
|
db_url = urlparse.urlunparse(parsed_url)
|
||||||
|
|
||||||
conf.set_override('connection', db_url, group='database',
|
conf.set_override('connection', db_url, group='database')
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
if (parsed_url[0].startswith("mysql")
|
if (parsed_url[0].startswith("mysql")
|
||||||
or parsed_url[0].startswith("postgresql")):
|
or parsed_url[0].startswith("postgresql")):
|
||||||
|
@ -34,15 +34,14 @@ class EngineTest(base.BaseTestCase):
|
|||||||
|
|
||||||
def test_get_connection(self):
|
def test_get_connection(self):
|
||||||
self.CONF.set_override('connection', 'log://localhost',
|
self.CONF.set_override('connection', 'log://localhost',
|
||||||
group='database', enforce_type=True)
|
group='database')
|
||||||
engine = storage.get_connection_from_config(self.CONF)
|
engine = storage.get_connection_from_config(self.CONF)
|
||||||
self.assertIsInstance(engine, impl_log.Connection)
|
self.assertIsInstance(engine, impl_log.Connection)
|
||||||
|
|
||||||
def test_get_connection_no_such_engine(self):
|
def test_get_connection_no_such_engine(self):
|
||||||
self.CONF.set_override('connection', 'no-such-engine://localhost',
|
self.CONF.set_override('connection', 'no-such-engine://localhost',
|
||||||
group='database', enforce_type=True)
|
group='database')
|
||||||
self.CONF.set_override('max_retries', 0, 'database',
|
self.CONF.set_override('max_retries', 0, 'database')
|
||||||
enforce_type=True)
|
|
||||||
try:
|
try:
|
||||||
storage.get_connection_from_config(self.CONF)
|
storage.get_connection_from_config(self.CONF)
|
||||||
except RuntimeError as err:
|
except RuntimeError as err:
|
||||||
@ -67,12 +66,9 @@ class ConnectionRetryTest(base.BaseTestCase):
|
|||||||
raise ConnectionError
|
raise ConnectionError
|
||||||
|
|
||||||
log_init.side_effect = x
|
log_init.side_effect = x
|
||||||
self.CONF.set_override("connection", "log://", "database",
|
self.CONF.set_override("connection", "log://", "database")
|
||||||
enforce_type=True)
|
self.CONF.set_override("retry_interval", 0.00001, "database")
|
||||||
self.CONF.set_override("retry_interval", 0.00001, "database",
|
self.CONF.set_override("max_retries", max_retries, "database")
|
||||||
enforce_type=True)
|
|
||||||
self.CONF.set_override("max_retries", max_retries, "database",
|
|
||||||
enforce_type=True)
|
|
||||||
self.assertRaises(ConnectionError,
|
self.assertRaises(ConnectionError,
|
||||||
storage.get_connection_from_config,
|
storage.get_connection_from_config,
|
||||||
self.CONF)
|
self.CONF)
|
||||||
@ -86,7 +82,6 @@ class ConnectionConfigTest(base.BaseTestCase):
|
|||||||
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
self.CONF = self.useFixture(fixture_config.Config(conf)).conf
|
||||||
|
|
||||||
def test_only_default_url(self):
|
def test_only_default_url(self):
|
||||||
self.CONF.set_override("connection", "log://", group="database",
|
self.CONF.set_override("connection", "log://", group="database")
|
||||||
enforce_type=True)
|
|
||||||
conn = storage.get_connection_from_config(self.CONF)
|
conn = storage.get_connection_from_config(self.CONF)
|
||||||
self.assertIsInstance(conn, impl_log.Connection)
|
self.assertIsInstance(conn, impl_log.Connection)
|
||||||
|
@ -151,7 +151,7 @@ class TestPartitioning(base.BaseTestCase):
|
|||||||
coordinator_cls=None):
|
coordinator_cls=None):
|
||||||
coordinator_cls = coordinator_cls or MockToozCoordinator
|
coordinator_cls = coordinator_cls or MockToozCoordinator
|
||||||
self.CONF.set_override('backend_url', 'xxx://yyy',
|
self.CONF.set_override('backend_url', 'xxx://yyy',
|
||||||
group='coordination', enforce_type=True)
|
group='coordination')
|
||||||
with mock.patch('tooz.coordination.get_coordinator',
|
with mock.patch('tooz.coordination.get_coordinator',
|
||||||
lambda _, member_id:
|
lambda _, member_id:
|
||||||
coordinator_cls(member_id, shared_storage)):
|
coordinator_cls(member_id, shared_storage)):
|
||||||
|
@ -68,8 +68,7 @@ class TestAlarmEvaluationService(tests_base.BaseTestCase):
|
|||||||
test_interval)
|
test_interval)
|
||||||
self.CONF.set_override('heartbeat',
|
self.CONF.set_override('heartbeat',
|
||||||
coordination_heartbeat,
|
coordination_heartbeat,
|
||||||
group='coordination',
|
group='coordination')
|
||||||
enforce_type=True)
|
|
||||||
|
|
||||||
self._fake_pc.is_active.return_value = coordination_active
|
self._fake_pc.is_active.return_value = coordination_active
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user