From 5bc617a93fc65012a1eeedb038b2d27f86d15d68 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 8 Nov 2015 19:26:55 -0500 Subject: [PATCH] Silence most of the deprecation spam Running keystoneclient unittest is really painful, because it's impossible to see what failed in all of the deprecation output. Make most of it go away. There is still a chunk that is being elusive. Change-Id: I006859b016274fc1adf69653ff75b3071d2c9446 --- keystoneclient/tests/unit/client_fixtures.py | 13 +++++++++++++ .../tests/unit/test_auth_token_middleware.py | 3 +++ .../tests/unit/test_s3_token_middleware.py | 1 + 3 files changed, 17 insertions(+) diff --git a/keystoneclient/tests/unit/client_fixtures.py b/keystoneclient/tests/unit/client_fixtures.py index 46266ce61..9ede861f6 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 18d0a3634..55c84bb59 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 1f8aa1c51..140ffc0ca 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,