Merge "Revert "Postpone deprecation warnings to Pike""

2 files changed, 10 insertions, 20 deletions

diff --git a/oslo_context/context.py b/oslo_context/context.py
index 339672e..bfbd715 100644
--- a/oslo_context/context.py
+++ b/oslo_context/context.py
@@ -34,6 +34,7 @@ import warnings
 
 import debtcollector
 
+
 _request_store = threading.local()
 
 # These arguments will be passed to a new context from the first available
@@ -130,22 +131,16 @@ 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}
 
-        # 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)
+        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 3f8e811..e172ca2 100644
--- a/oslo_context/tests/test_context.py
+++ b/oslo_context/tests/test_context.py
@@ -613,17 +613,12 @@ class ContextTest(test_base.BaseTestCase):
 
         self.assertEqual(0, len(self.warnings))
         self.assertEqual(user, ctx.user)
-        if context._log_deprecation_warnings:
-            self.assertEqual(1, len(self.warnings))
+        self.assertEqual(1, len(self.warnings))
         self.assertEqual(tenant, ctx.tenant)
-        if context._log_deprecation_warnings:
-            self.assertEqual(2, len(self.warnings))
+        self.assertEqual(2, len(self.warnings))
         self.assertEqual(domain, ctx.domain)
-        if context._log_deprecation_warnings:
-            self.assertEqual(3, len(self.warnings))
+        self.assertEqual(3, len(self.warnings))
         self.assertEqual(user_domain, ctx.user_domain)
-        if context._log_deprecation_warnings:
-            self.assertEqual(4, len(self.warnings))
+        self.assertEqual(4, len(self.warnings))
         self.assertEqual(project_domain, ctx.project_domain)
-        if context._log_deprecation_warnings:
-            self.assertEqual(5, len(self.warnings))
+        self.assertEqual(5, len(self.warnings))