summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Dague <sean@dague.net>2017-06-12 14:24:24 -0400
committerSean Dague <sean@dague.net>2017-06-12 14:26:24 -0400
commit6e420e9de5958dd27e6f1a38ef9bc578dde435a2 (patch)
tree6db0e1c1fc57b1562a629a7dd9032d88ee2e5e3b
parentacad0dac61c429299013a01f238e0477db2c9105 (diff)
downloadoslo-config-6e420e9de5958dd27e6f1a38ef9bc578dde435a2.tar.gz
Don't set enforce_type if we are using the default4.5.0
The test fixture for oslo.config always sets enforce_type parameter in set_default, however because of debtcollector, this means it also always emits a deprecation warning as well, even when the caller never set this parameter. oslo.config's fixtures should not trigger deprecation warnings during normal usage. So be extra careful and fix that. Change-Id: I5471b5d164ff40785e07b5f66e1f4673cf716971
-rw-r--r--oslo_config/fixture.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/oslo_config/fixture.py b/oslo_config/fixture.py
index a5f5142..32b7324 100644
--- a/oslo_config/fixture.py
+++ b/oslo_config/fixture.py
@@ -70,7 +70,12 @@ class Config(fixtures.Fixture):
group = kw.pop('group', None)
enforce_type = kw.pop('enforce_type', True)
for k, v in kw.items():
- self.conf.set_override(k, v, group, enforce_type=enforce_type)
+ if enforce_type is False:
+ self.conf.set_override(k, v, group, enforce_type=False)
+ else:
+ # this removes the deprecation warning if you are just
+ # using defaults
+ self.conf.set_override(k, v, group)
def _unregister_config_opts(self):
for group in self._registered_config_opts: