diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 02:31:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 02:31:42 +0000 |
| commit | b621a6f932edcda1cdba02534e382b962e759f9e (patch) | |
| tree | 598e201f47438d541ea2153f3e53730786e0107e | |
| parent | e2beaefd7bc129e02f8933726550e684f92f1050 (diff) | |
| parent | a5a98d7e3bbcfb6d4e8cca8f4aca08cca4286b17 (diff) | |
| download | swift-b621a6f932edcda1cdba02534e382b962e759f9e.tar.gz | |
Merge "tests: Fix swiftclient/requests log level adjustment"
| -rw-r--r-- | test/probe/test_sharder.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/probe/test_sharder.py b/test/probe/test_sharder.py index adcf6dae1..69e923b43 100644 --- a/test/probe/test_sharder.py +++ b/test/probe/test_sharder.py @@ -44,6 +44,11 @@ from test.probe.common import ReplProbeTest, get_server_number, \ wait_for_server_to_hangup, ENABLED_POLICIES import mock +try: + from swiftclient.requests_compat import requests as client_requests +except ImportError: + # legacy location + from swiftclient.client import requests as client_requests MIN_SHARD_CONTAINER_THRESHOLD = 4 MAX_SHARD_CONTAINER_THRESHOLD = 100 @@ -118,8 +123,8 @@ class BaseTestContainerSharding(ReplProbeTest): def setUp(self): client.logger.setLevel(client.logging.WARNING) - client.requests.logging.getLogger().setLevel( - client.requests.logging.WARNING) + client_requests.logging.getLogger().setLevel( + client_requests.logging.WARNING) super(BaseTestContainerSharding, self).setUp() _, self.admin_token = get_auth( PROXY_BASE_URL + '/auth/v1.0', 'admin:admin', 'admin') |