summaryrefslogtreecommitdiff
path: root/test/probe/test_sharder.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/probe/test_sharder.py')
-rw-r--r--test/probe/test_sharder.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/probe/test_sharder.py b/test/probe/test_sharder.py
index 3cf785a50..c369a4760 100644
--- a/test/probe/test_sharder.py
+++ b/test/probe/test_sharder.py
@@ -43,6 +43,11 @@ from test.probe.common import ReplProbeTest, get_server_number, \
from test.debug_logger import debug_logger
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
@@ -116,8 +121,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')