Merge "Unit tests catch deprecated function usage"

7 files changed, 38 insertions, 1 deletions

diff --git a/keystoneclient/tests/unit/client_fixtures.py b/keystoneclient/tests/unit/client_fixtures.py
index b226e32..dfb2b21 100644
--- a/keystoneclient/tests/unit/client_fixtures.py
+++ b/keystoneclient/tests/unit/client_fixtures.py
@@ -13,6 +13,7 @@
 # under the License.
 
 import os
+import warnings
 
 import fixtures
 from oslo_serialization import jsonutils
@@ -595,3 +596,14 @@ class HackingCode(fixtures.Fixture):
             (30, 0, 'K333'),
         ],
     }
+
+
+class Deprecations(fixtures.Fixture):
+    def setUp(self):
+        super(Deprecations, self).setUp()
+
+        # If keystoneclient calls any deprecated function this will raise an
+        # exception.
+        warnings.filterwarnings('error', category=DeprecationWarning,
+                                module='^keystoneclient\\.')
+        self.addCleanup(warnings.resetwarnings)
diff --git a/keystoneclient/tests/unit/test_auth_token_middleware.py b/keystoneclient/tests/unit/test_auth_token_middleware.py
index 8320bc5..9cdaf92 100644
--- a/keystoneclient/tests/unit/test_auth_token_middleware.py
+++ b/keystoneclient/tests/unit/test_auth_token_middleware.py
@@ -206,7 +206,9 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
 
     """
     def setUp(self, expected_env=None, auth_version=None, fake_app=None):
-        testtools.TestCase.setUp(self)
+        super(BaseAuthTokenMiddlewareTest, self).setUp()
+
+        self.useFixture(client_fixtures.Deprecations())
 
         self.expected_env = expected_env or dict()
         self.fake_app = fake_app or FakeApp
@@ -1673,6 +1675,10 @@ class v3AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
 
 
 class TokenEncodingTest(testtools.TestCase):
+    def setUp(self):
+        super(TokenEncodingTest, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
+
     def test_unquoted_token(self):
         self.assertEqual('foo%20bar', auth_token.safe_quote('foo bar'))
 
diff --git a/keystoneclient/tests/unit/test_ec2utils.py b/keystoneclient/tests/unit/test_ec2utils.py
index 71fc176..f74eb2f 100644
--- a/keystoneclient/tests/unit/test_ec2utils.py
+++ b/keystoneclient/tests/unit/test_ec2utils.py
@@ -17,12 +17,14 @@ from __future__ import unicode_literals
 import testtools
 
 from keystoneclient.contrib.ec2 import utils
+from keystoneclient.tests.unit import client_fixtures
 
 
 class Ec2SignerTest(testtools.TestCase):
 
     def setUp(self):
         super(Ec2SignerTest, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
         self.access = '966afbde20b84200ae4e62e09acf46b2'
         self.secret = '89cdf9e94e2643cab35b8b8ac5a51f83'
         self.signer = utils.Ec2Signer(self.secret)
diff --git a/keystoneclient/tests/unit/test_hacking_checks.py b/keystoneclient/tests/unit/test_hacking_checks.py
index 220d258..2e4cc1d 100644
--- a/keystoneclient/tests/unit/test_hacking_checks.py
+++ b/keystoneclient/tests/unit/test_hacking_checks.py
@@ -21,6 +21,9 @@ from keystoneclient.tests.unit import client_fixtures
 
 
 class TestCheckOsloNamespaceImports(testtools.TestCase):
+    def setUp(self):
+        super(TestCheckOsloNamespaceImports, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
 
     # We are patching pep8 so that only the check under test is actually
     # installed.
diff --git a/keystoneclient/tests/unit/test_memcache_crypt.py b/keystoneclient/tests/unit/test_memcache_crypt.py
index be07b24..2546121 100644
--- a/keystoneclient/tests/unit/test_memcache_crypt.py
+++ b/keystoneclient/tests/unit/test_memcache_crypt.py
@@ -14,9 +14,14 @@ import six
 import testtools
 
 from keystoneclient.middleware import memcache_crypt
+from keystoneclient.tests.unit import client_fixtures
 
 
 class MemcacheCryptPositiveTests(testtools.TestCase):
+    def setUp(self):
+        super(MemcacheCryptPositiveTests, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
+
     def _setup_keys(self, strategy):
         return memcache_crypt.derive_keys(b'token', b'secret', strategy)
 
diff --git a/keystoneclient/tests/unit/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py
index dfb4406..1f8aa1c 100644
--- a/keystoneclient/tests/unit/test_s3_token_middleware.py
+++ b/keystoneclient/tests/unit/test_s3_token_middleware.py
@@ -20,6 +20,7 @@ import testtools
 import webob
 
 from keystoneclient.middleware import s3_token
+from keystoneclient.tests.unit import client_fixtures
 from keystoneclient.tests.unit import utils
 
 
@@ -221,6 +222,10 @@ class S3TokenMiddlewareTestBad(S3TokenMiddlewareTestBase):
 
 
 class S3TokenMiddlewareTestUtil(testtools.TestCase):
+    def setUp(self):
+        super(S3TokenMiddlewareTestUtil, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
+
     def test_split_path_failed(self):
         self.assertRaises(ValueError, s3_token.split_path, '')
         self.assertRaises(ValueError, s3_token.split_path, '/')
diff --git a/keystoneclient/tests/unit/utils.py b/keystoneclient/tests/unit/utils.py
index 22dbe02..d865e68 100644
--- a/keystoneclient/tests/unit/utils.py
+++ b/keystoneclient/tests/unit/utils.py
@@ -22,6 +22,8 @@ import six
 from six.moves.urllib import parse as urlparse
 import testtools
 
+from keystoneclient.tests.unit import client_fixtures
+
 
 class TestCase(testtools.TestCase):
 
@@ -40,6 +42,8 @@ class TestCase(testtools.TestCase):
 
     def setUp(self):
         super(TestCase, self).setUp()
+        self.useFixture(client_fixtures.Deprecations())
+
         self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG))
         self.requests_mock = self.useFixture(fixture.Fixture())