diff options
Diffstat (limited to 'oslo_context')
| -rw-r--r-- | oslo_context/context.py | 15 | ||||
| -rw-r--r-- | oslo_context/tests/test_context.py | 15 |
2 files changed, 20 insertions, 10 deletions
diff --git a/oslo_context/context.py b/oslo_context/context.py index 8ec3c10..945cb82 100644 --- a/oslo_context/context.py +++ b/oslo_context/context.py @@ -35,7 +35,6 @@ import warnings import debtcollector from positional import positional - _request_store = threading.local() # These arguments will be passed to a new context from the first available @@ -131,16 +130,22 @@ class _DeprecatedPolicyValues(collections.MutableMapping): return d +# FIXME(dims): Skip deprecation warnings until Pike (Version 2.14) +_log_deprecation_warnings = False + + def _moved_msg(new_name, old_name): if old_name: deprecated_msg = "Property '%(old_name)s' has moved to '%(new_name)s'" deprecated_msg = deprecated_msg % {'old_name': old_name, 'new_name': new_name} - debtcollector.deprecate(deprecated_msg, - version='2.6', - removal_version='3.0', - stacklevel=5) + # FIXME(dims): Skip deprecation warnings until Pike (Version 2.14) + if _log_deprecation_warnings: + debtcollector.deprecate(deprecated_msg, + version='2.6', + removal_version='3.0', + stacklevel=5) def _moved_property(new_name, old_name=None, target=None): diff --git a/oslo_context/tests/test_context.py b/oslo_context/tests/test_context.py index c8bf283..f6486b7 100644 --- a/oslo_context/tests/test_context.py +++ b/oslo_context/tests/test_context.py @@ -606,12 +606,17 @@ class ContextTest(test_base.BaseTestCase): self.assertEqual(0, len(self.warnings)) self.assertEqual(user, ctx.user) - self.assertEqual(1, len(self.warnings)) + if context._log_deprecation_warnings: + self.assertEqual(1, len(self.warnings)) self.assertEqual(tenant, ctx.tenant) - self.assertEqual(2, len(self.warnings)) + if context._log_deprecation_warnings: + self.assertEqual(2, len(self.warnings)) self.assertEqual(domain, ctx.domain) - self.assertEqual(3, len(self.warnings)) + if context._log_deprecation_warnings: + self.assertEqual(3, len(self.warnings)) self.assertEqual(user_domain, ctx.user_domain) - self.assertEqual(4, len(self.warnings)) + if context._log_deprecation_warnings: + self.assertEqual(4, len(self.warnings)) self.assertEqual(project_domain, ctx.project_domain) - self.assertEqual(5, len(self.warnings)) + if context._log_deprecation_warnings: + self.assertEqual(5, len(self.warnings)) |