openstack/swift
Code Issues Proposed changes

Merge "tests: Fix swiftclient/requests log level adjustment"

Browse Source
This commit is contained in:
Zuul 2022-04-22 02:31:42 +00:00 committed by Gerrit Code Review
commit b621a6f932
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/probe/test_sharder.py
View File

@ -44,6 +44,11 @@ from test.probe.common import ReplProbeTest, get_server_number, \
wait_for_server_to_hangup, ENABLED_POLICIES wait_for_server_to_hangup, ENABLED_POLICIES
import mock 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 MIN_SHARD_CONTAINER_THRESHOLD = 4
MAX_SHARD_CONTAINER_THRESHOLD = 100 MAX_SHARD_CONTAINER_THRESHOLD = 100
@ -118,8 +123,8 @@ class BaseTestContainerSharding(ReplProbeTest):
def setUp(self): def setUp(self):
client.logger.setLevel(client.logging.WARNING) client.logger.setLevel(client.logging.WARNING)
client.requests.logging.getLogger().setLevel( client_requests.logging.getLogger().setLevel(
client.requests.logging.WARNING) client_requests.logging.WARNING)
super(BaseTestContainerSharding, self).setUp() super(BaseTestContainerSharding, self).setUp()
_, self.admin_token = get_auth( _, self.admin_token = get_auth(
PROXY_BASE_URL + '/auth/v1.0', 'admin:admin', 'admin') PROXY_BASE_URL + '/auth/v1.0', 'admin:admin', 'admin')