]> git-server-git.apps.pok.os.sepia.ceph.com Git - s3-tests.git/commitdiff
chore:Bump the list-objects to paginator
authoriraj465 <saptarshimajumder19@gmail.com>
Thu, 15 Jul 2021 21:37:21 +0000 (03:07 +0530)
committerAli Maredia <amaredia@redhat.com>
Wed, 15 Sep 2021 20:59:42 +0000 (16:59 -0400)
(cherry picked from commit 20aa9aa071e704020c7fbf1b95f447cb7f33a763)

s3tests_boto3/functional/test_s3.py

index 68029a0191f65f5464df4149116fb78aacf1c8ab..96bdc4b553840764e2d7de8ea67de264f47796bf 100644 (file)
@@ -2035,12 +2035,20 @@ def test_multi_object_delete_key_limit():
     bucket_name = _create_objects(keys=key_names)
     client = get_client()
 
+    paginator = client.get_paginator('list_objects')
+    pages = paginator.paginate(Bucket=bucket_name)
+    numKeys = 0
+    for page in pages:
+        numKeys += len(page['Contents'])
+    
     response = client.list_objects(Bucket=bucket_name)
-    eq(len(response['Contents']), 1001)
+    eq(numKeys, 1001)
 
     objs_dict = _make_objs_dict(key_names=key_names)
     e = assert_raises(ClientError,client.delete_objects,Bucket=bucket_name,Delete=objs_dict)
-    eq(e.response['Error']['Code'], 400)
+
+    status, error_code = _get_status_and_error_code(e.response)
+    eq(status, 400)
 
 @attr(resource='object')
 @attr(method='put')