diff --git a/glance/tests/unit/api/test_common.py b/glance/tests/unit/api/test_common.py index e2b5b484f8..e369b38200 100644 --- a/glance/tests/unit/api/test_common.py +++ b/glance/tests/unit/api/test_common.py @@ -13,12 +13,15 @@ # License for the specific language governing permissions and limitations # under the License. -import testtools from unittest import mock + +from oslo_log.fixture import logging_error as log_fixture +import testtools import webob import glance.api.common from glance.common import exception +from glance.tests.unit import fixtures as glance_fixtures class SimpleIterator(object): @@ -39,6 +42,17 @@ class SimpleIterator(object): class TestSizeCheckedIter(testtools.TestCase): + + def setUp(self): + super().setUp() + + # Limit the amount of DeprecationWarning messages in the unit test logs + self.useFixture(glance_fixtures.WarningsFixture()) + + # Make sure logging output is limited but still test debug formatting + self.useFixture(log_fixture.get_logging_handle_error_fixture()) + self.useFixture(glance_fixtures.StandardLogging()) + def _get_image_metadata(self): return {'id': 'e31cb99c-fe89-49fb-9cc5-f5104fffa636'} @@ -128,6 +142,16 @@ class TestSizeCheckedIter(testtools.TestCase): class TestThreadPool(testtools.TestCase): + def setUp(self): + super().setUp() + + # Limit the amount of DeprecationWarning messages in the unit test logs + self.useFixture(glance_fixtures.WarningsFixture()) + + # Make sure logging output is limited but still test debug formatting + self.useFixture(log_fixture.get_logging_handle_error_fixture()) + self.useFixture(glance_fixtures.StandardLogging()) + @mock.patch('glance.async_.get_threadpool_model') def test_get_thread_pool(self, mock_gtm): get_thread_pool = glance.api.common.get_thread_pool diff --git a/glance/tests/unit/common/test_client.py b/glance/tests/unit/common/test_client.py index b94cad692e..abe03870bd 100644 --- a/glance/tests/unit/common/test_client.py +++ b/glance/tests/unit/common/test_client.py @@ -16,10 +16,12 @@ import http.client from unittest import mock +from oslo_log.fixture import logging_error as log_fixture import testtools from glance.common import auth from glance.common import client +from glance.tests.unit import fixtures as glance_fixtures from glance.tests import utils @@ -31,8 +33,12 @@ class TestClient(testtools.TestCase): self.client = client.BaseClient(self.endpoint, port=9191, auth_token='abc123') - def tearDown(self): - super(TestClient, self).tearDown() + # Limit the amount of DeprecationWarning messages in the unit test logs + self.useFixture(glance_fixtures.WarningsFixture()) + + # Make sure logging output is limited but still test debug formatting + self.useFixture(log_fixture.get_logging_handle_error_fixture()) + self.useFixture(glance_fixtures.StandardLogging()) def test_make_auth_plugin(self): creds = {'strategy': 'keystone'} diff --git a/glance/tests/unit/test_cache_middleware.py b/glance/tests/unit/test_cache_middleware.py index 39288b8213..5e8602c5f4 100644 --- a/glance/tests/unit/test_cache_middleware.py +++ b/glance/tests/unit/test_cache_middleware.py @@ -16,6 +16,7 @@ import http.client as http from unittest.mock import patch +from oslo_log.fixture import logging_error as log_fixture from oslo_policy import policy from oslo_utils.fixture import uuidsentinel as uuids import testtools @@ -26,6 +27,7 @@ import glance.api.policy from glance.common import exception from glance import context from glance.tests.unit import base +from glance.tests.unit import fixtures as glance_fixtures from glance.tests.unit import test_policy from glance.tests.unit import utils as unit_test_utils @@ -59,6 +61,16 @@ class ImageStub(object): class TestCacheMiddlewareURLMatching(testtools.TestCase): + def setUp(self): + super().setUp() + + # Limit the amount of DeprecationWarning messages in the unit test logs + self.useFixture(glance_fixtures.WarningsFixture()) + + # Make sure logging output is limited but still test debug formatting + self.useFixture(log_fixture.get_logging_handle_error_fixture()) + self.useFixture(glance_fixtures.StandardLogging()) + def test_v2_match_id(self): req = webob.Request.blank('/v2/images/asdf/file') out = glance.api.middleware.cache.CacheFilter._match_request(req) @@ -81,6 +93,13 @@ class TestCacheMiddlewareRequestStashCacheInfo(testtools.TestCase): self.request = webob.Request.blank('') self.middleware = glance.api.middleware.cache.CacheFilter + # Limit the amount of DeprecationWarning messages in the unit test logs + self.useFixture(glance_fixtures.WarningsFixture()) + + # Make sure logging output is limited but still test debug formatting + self.useFixture(log_fixture.get_logging_handle_error_fixture()) + self.useFixture(glance_fixtures.StandardLogging()) + def test_stash_cache_request_info(self): self.middleware._stash_request_info(self.request, 'asdf', 'GET', 'v2') self.assertEqual('asdf', self.request.environ['api.cache.image_id'])