From d8e33f78805ebc7cc2e960fc56304724c9a00198 Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Thu, 27 Apr 2017 12:09:29 +0200 Subject: [PATCH] Remove deprecated oslo.config messages. DeprecationWarning: Using the 'enforce_type' argument is deprecated in version '4.0' and will be removed in version '5.0': The argument enforce_type has changed its default value to True and then will be removed completely. This option have never been useful, and now the default is already True. So we don't need to raise requirement for this. Change-Id: I042a5d98748e2b2c6ee8307340aa6056bf0a1dfd --- .../functional/api/v2/test_alarm_scenarios.py | 3 +-- aodh/tests/functional/db.py | 5 ++--- aodh/tests/functional/gabbi/fixtures.py | 6 ++---- .../functional/storage/test_get_connection.py | 19 +++++++------------ aodh/tests/unit/test_coordination.py | 2 +- aodh/tests/unit/test_evaluator.py | 3 +-- 6 files changed, 14 insertions(+), 24 deletions(-) diff --git a/aodh/tests/functional/api/v2/test_alarm_scenarios.py b/aodh/tests/functional/api/v2/test_alarm_scenarios.py index da4f8596b..b128e3bf6 100644 --- a/aodh/tests/functional/api/v2/test_alarm_scenarios.py +++ b/aodh/tests/functional/api/v2/test_alarm_scenarios.py @@ -385,8 +385,7 @@ class TestAlarms(TestAlarmsBase): def test_get_alarm_forbiden(self): pf = os.path.abspath('aodh/tests/functional/api/v2/policy.json-test') - self.CONF.set_override('policy_file', pf, group='oslo_policy', - enforce_type=True) + self.CONF.set_override('policy_file', pf, group='oslo_policy') self.CONF.set_override('auth_mode', None, group='api') self.app = webtest.TestApp(app.load_app(self.CONF)) diff --git a/aodh/tests/functional/db.py b/aodh/tests/functional/db.py index d2f867643..29b309e6a 100644 --- a/aodh/tests/functional/db.py +++ b/aodh/tests/functional/db.py @@ -92,8 +92,7 @@ class TestBase(test_base.BaseTestCase): conf = service.prepare_service(argv=[], config_files=[]) self.CONF = self.useFixture(fixture_config.Config(conf)).conf - self.CONF.set_override('connection', db_url, group="database", - enforce_type=True) + self.CONF.set_override('connection', db_url, group="database") manager = self.DRIVER_MANAGERS.get(self.engine) if not manager: @@ -104,7 +103,7 @@ class TestBase(test_base.BaseTestCase): self.useFixture(self.db_manager) 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.upgrade() diff --git a/aodh/tests/functional/gabbi/fixtures.py b/aodh/tests/functional/gabbi/fixtures.py index d54282dfb..c9f01030c 100644 --- a/aodh/tests/functional/gabbi/fixtures.py +++ b/aodh/tests/functional/gabbi/fixtures.py @@ -79,8 +79,7 @@ class ConfigFixture(fixture.GabbiFixture): conf.set_override('policy_file', os.path.abspath( 'aodh/tests/open-policy.json'), - group='oslo_policy', - enforce_type=True) + group='oslo_policy') conf.set_override('auth_mode', None, group='api') parsed_url = urlparse.urlparse(db_url) @@ -89,8 +88,7 @@ class ConfigFixture(fixture.GabbiFixture): parsed_url[2] += '-%s' % uuidutils.generate_uuid(dashed=False) db_url = urlparse.urlunparse(parsed_url) - conf.set_override('connection', db_url, group='database', - enforce_type=True) + conf.set_override('connection', db_url, group='database') if (parsed_url[0].startswith("mysql") or parsed_url[0].startswith("postgresql")): diff --git a/aodh/tests/functional/storage/test_get_connection.py b/aodh/tests/functional/storage/test_get_connection.py index 0013ad66a..38312ce4e 100644 --- a/aodh/tests/functional/storage/test_get_connection.py +++ b/aodh/tests/functional/storage/test_get_connection.py @@ -34,15 +34,14 @@ class EngineTest(base.BaseTestCase): def test_get_connection(self): self.CONF.set_override('connection', 'log://localhost', - group='database', enforce_type=True) + group='database') engine = storage.get_connection_from_config(self.CONF) self.assertIsInstance(engine, impl_log.Connection) def test_get_connection_no_such_engine(self): self.CONF.set_override('connection', 'no-such-engine://localhost', - group='database', enforce_type=True) - self.CONF.set_override('max_retries', 0, 'database', - enforce_type=True) + group='database') + self.CONF.set_override('max_retries', 0, 'database') try: storage.get_connection_from_config(self.CONF) except RuntimeError as err: @@ -67,12 +66,9 @@ class ConnectionRetryTest(base.BaseTestCase): raise ConnectionError log_init.side_effect = x - self.CONF.set_override("connection", "log://", "database", - enforce_type=True) - self.CONF.set_override("retry_interval", 0.00001, "database", - enforce_type=True) - self.CONF.set_override("max_retries", max_retries, "database", - enforce_type=True) + self.CONF.set_override("connection", "log://", "database") + self.CONF.set_override("retry_interval", 0.00001, "database") + self.CONF.set_override("max_retries", max_retries, "database") self.assertRaises(ConnectionError, storage.get_connection_from_config, self.CONF) @@ -86,7 +82,6 @@ class ConnectionConfigTest(base.BaseTestCase): self.CONF = self.useFixture(fixture_config.Config(conf)).conf def test_only_default_url(self): - self.CONF.set_override("connection", "log://", group="database", - enforce_type=True) + self.CONF.set_override("connection", "log://", group="database") conn = storage.get_connection_from_config(self.CONF) self.assertIsInstance(conn, impl_log.Connection) diff --git a/aodh/tests/unit/test_coordination.py b/aodh/tests/unit/test_coordination.py index df028a35d..63dcadc8b 100644 --- a/aodh/tests/unit/test_coordination.py +++ b/aodh/tests/unit/test_coordination.py @@ -152,7 +152,7 @@ class TestPartitioning(base.BaseTestCase): coordinator_cls=None): coordinator_cls = coordinator_cls or MockToozCoordinator self.CONF.set_override('backend_url', 'xxx://yyy', - group='coordination', enforce_type=True) + group='coordination') with mock.patch('tooz.coordination.get_coordinator', lambda _, member_id: coordinator_cls(member_id, shared_storage)): diff --git a/aodh/tests/unit/test_evaluator.py b/aodh/tests/unit/test_evaluator.py index bf81ebc75..81420a6e3 100644 --- a/aodh/tests/unit/test_evaluator.py +++ b/aodh/tests/unit/test_evaluator.py @@ -68,8 +68,7 @@ class TestAlarmEvaluationService(tests_base.BaseTestCase): test_interval) self.CONF.set_override('heartbeat', coordination_heartbeat, - group='coordination', - enforce_type=True) + group='coordination') self._fake_pc.is_active.return_value = coordination_active