diff options
| author | Tim Burke <tim.burke@gmail.com> | 2020-11-09 10:55:15 -0800 |
|---|---|---|
| committer | Pete Zaitcev <zaitcev@kotori.zaitcev.us> | 2021-02-23 20:39:47 -0600 |
| commit | 5791cec31e6935a9af691dbd181bc1657d87ce2d (patch) | |
| tree | d23be927dcd1f308de94911d54d29c7de9778d57 | |
| parent | 959a98d7b18aba3e9b9812f5cf81d107a237e59e (diff) | |
| download | swift-5791cec31e6935a9af691dbd181bc1657d87ce2d.tar.gz | |
Use swiftclient Connections in sharding probe tests
This gets us retries "for free" and should reduce gate flakiness.
Cherry-Picked-From: Ia2e4c94f246230a3e25e4557b4b2c1a3a67df756
Change-Id: Icdf1f9d02d1e6ae5dc1112d2792ef6845067158b
| -rw-r--r-- | test/probe/test_sharder.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/test/probe/test_sharder.py b/test/probe/test_sharder.py index b453af565..118d1ebc6 100644 --- a/test/probe/test_sharder.py +++ b/test/probe/test_sharder.py @@ -146,25 +146,24 @@ class BaseTestContainerSharding(ReplProbeTest): wait_for_server_to_hangup(ipport) def put_objects(self, obj_names, contents=None): + conn = client.Connection(preauthurl=self.url, preauthtoken=self.token) results = [] for obj in obj_names: rdict = {} - client.put_object(self.url, token=self.token, - container=self.container_name, name=obj, - contents=contents, response_dict=rdict) + conn.put_object(self.container_name, obj, + contents=contents, response_dict=rdict) results.append((obj, rdict['headers'].get('x-object-version-id'))) return results def delete_objects(self, obj_names_and_versions): + conn = client.Connection(preauthurl=self.url, preauthtoken=self.token) for obj in obj_names_and_versions: if isinstance(obj, tuple): obj, version = obj - client.delete_object( - self.url, self.token, self.container_name, obj, - query_string='version-id=%s' % version) + conn.delete_object(self.container_name, obj, + query_string='version-id=%s' % version) else: - client.delete_object( - self.url, self.token, self.container_name, obj) + conn.delete_object(self.container_name, obj) def get_container_shard_ranges(self, account=None, container=None): account = account if account else self.account |