diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-26 02:36:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-26 02:36:45 +0000 |
| commit | dc658842edb5bd448fbe841fd161fbc385e6e30a (patch) | |
| tree | d2709d38eb4fb530145a8bc6c133dbee3247065c | |
| parent | 655719d6c96bc473c03a4f51fbb12160f80bfcb4 (diff) | |
| parent | 5bc617a93fc65012a1eeedb038b2d27f86d15d68 (diff) | |
| download | python-keystoneclient-dc658842edb5bd448fbe841fd161fbc385e6e30a.tar.gz | |
Merge "Silence most of the deprecation spam"
| -rw-r--r-- | keystoneclient/tests/unit/client_fixtures.py | 13 | ||||
| -rw-r--r-- | keystoneclient/tests/unit/test_auth_token_middleware.py | 3 | ||||
| -rw-r--r-- | keystoneclient/tests/unit/test_s3_token_middleware.py | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/keystoneclient/tests/unit/client_fixtures.py b/keystoneclient/tests/unit/client_fixtures.py index 46266ce..9ede861 100644 --- a/keystoneclient/tests/unit/client_fixtures.py +++ b/keystoneclient/tests/unit/client_fixtures.py @@ -607,15 +607,28 @@ class Deprecations(fixtures.Fixture): # exception. warnings.filterwarnings('error', category=DeprecationWarning, module='^keystoneclient\\.') + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^debtcollector\\.') self.addCleanup(warnings.resetwarnings) def expect_deprecations(self): """Call this if the test expects to call deprecated function.""" warnings.resetwarnings() + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^keystoneclient\\.') + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^debtcollector\\.') @contextlib.contextmanager def expect_deprecations_here(self): warnings.resetwarnings() + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^keystoneclient\\.') + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^debtcollector\\.') yield + warnings.resetwarnings() warnings.filterwarnings('error', category=DeprecationWarning, module='^keystoneclient\\.') + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='^debtcollector\\.') diff --git a/keystoneclient/tests/unit/test_auth_token_middleware.py b/keystoneclient/tests/unit/test_auth_token_middleware.py index 18d0a36..55c84bb 100644 --- a/keystoneclient/tests/unit/test_auth_token_middleware.py +++ b/keystoneclient/tests/unit/test_auth_token_middleware.py @@ -15,6 +15,7 @@ import calendar import datetime import json +import logging import os import shutil import stat @@ -209,6 +210,7 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase): super(BaseAuthTokenMiddlewareTest, self).setUp() self.useFixture(client_fixtures.Deprecations()) + self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG)) self.expected_env = expected_env or dict() self.fake_app = fake_app or FakeApp @@ -1678,6 +1680,7 @@ class TokenEncodingTest(testtools.TestCase): def setUp(self): super(TokenEncodingTest, self).setUp() self.useFixture(client_fixtures.Deprecations()) + self.logger = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG)) def test_unquoted_token(self): self.assertEqual('foo%20bar', auth_token.safe_quote('foo bar')) diff --git a/keystoneclient/tests/unit/test_s3_token_middleware.py b/keystoneclient/tests/unit/test_s3_token_middleware.py index 1f8aa1c..140ffc0 100644 --- a/keystoneclient/tests/unit/test_s3_token_middleware.py +++ b/keystoneclient/tests/unit/test_s3_token_middleware.py @@ -48,6 +48,7 @@ class S3TokenMiddlewareTestBase(utils.TestCase): def setUp(self): super(S3TokenMiddlewareTestBase, self).setUp() + self.useFixture(client_fixtures.Deprecations()) self.conf = { 'auth_host': self.TEST_HOST, 'auth_port': self.TEST_PORT, |