Merge "Add functional tests for normal statuses of Delete Multiple Objects"

swift3/test/functional/test_multi_delete.py

@@ -0,0 +1,107 @@
+# Copyright (c) 2015 OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from swift3.test.functional.utils import assert_common_response_headers, \
+    calculate_md5
+from swift3.etree import fromstring, tostring, Element, SubElement
+from swift3.test.functional import Swift3FunctionalTestCase
+
+
+class TestSwift3MultiDelete(Swift3FunctionalTestCase):
+    def setUp(self):
+        super(TestSwift3MultiDelete, self).setUp()
+
+    def _prepare_test_delete_multi_objects(self, bucket, objects):
+        self.conn.make_request('PUT', bucket)
+        for obj in objects:
+            self.conn.make_request('PUT', bucket, obj)
+
+    def _gen_multi_delete_xml(self, objects):
+        elem = Element('Delete')
+        for key in objects:
+            obj = SubElement(elem, 'Object')
+            SubElement(obj, 'Key').text = key
+
+        return tostring(elem, use_s3ns=False)
+
+    def test_delete_multi_objects(self):
+        bucket = 'bucket'
+        put_objects = ['obj%s' % var for var in xrange(4)]
+        self._prepare_test_delete_multi_objects(bucket, put_objects)
+        query = 'delete'
+
+        # Delete an object via MultiDelete API
+        req_objects = ['obj0']
+        xml = self._gen_multi_delete_xml(req_objects)
+        content_md5 = calculate_md5(xml)
+        status, headers, body = \
+            self.conn.make_request('POST', bucket, body=xml,
+                                   headers={'Content-MD5': content_md5},
+                                   query=query)
+        self.assertEquals(status, 200)
+        assert_common_response_headers(self, headers)
+        self.assertTrue(headers['content-type'] is not None)
+        self.assertEquals(headers['content-length'], str(len(body)))
+        elem = fromstring(body)
+        resp_objects = elem.findall('Deleted')
+        self.assertEquals(len(resp_objects), len(req_objects))
+        for o in resp_objects:
+            self.assertTrue(o.find('Key').text in req_objects)
+
+        # Delete 2 objects via MultiDelete API
+        req_objects = ['obj1', 'obj2']
+        xml = self._gen_multi_delete_xml(req_objects)
+        content_md5 = calculate_md5(xml)
+        status, headers, body = \
+            self.conn.make_request('POST', bucket, body=xml,
+                                   headers={'Content-MD5': content_md5},
+                                   query=query)
+        self.assertEquals(status, 200)
+        elem = fromstring(body, 'DeleteResult')
+        resp_objects = elem.findall('Deleted')
+        self.assertEquals(len(resp_objects), len(req_objects))
+        for o in resp_objects:
+            self.assertTrue(o.find('Key').text in req_objects)
+
+        # Delete 2 objects via MultiDelete API but one (obj4) doesn't exist.
+        req_objects = ['obj3', 'obj4']
+        xml = self._gen_multi_delete_xml(req_objects)
+        content_md5 = calculate_md5(xml)
+        status, headers, body = \
+            self.conn.make_request('POST', bucket, body=xml,
+                                   headers={'Content-MD5': content_md5},
+                                   query=query)
+        self.assertEquals(status, 200)
+        elem = fromstring(body, 'DeleteResult')
+        resp_objects = elem.findall('Deleted')
+        # S3 assumes a NoSuchKey object as deleted.
+        self.assertEquals(len(resp_objects), len(req_objects))
+        for o in resp_objects:
+            self.assertTrue(o.find('Key').text in req_objects)
+
+        # Delete 2 objects via MultiDelete API but no objects exist
+        req_objects = ['obj4', 'obj5']
+        xml = self._gen_multi_delete_xml(req_objects)
+        content_md5 = calculate_md5(xml)
+        status, headers, body = \
+            self.conn.make_request('POST', bucket, body=xml,
+                                   headers={'Content-MD5': content_md5},
+                                   query=query)
+        self.assertEquals(status, 200)
+        elem = fromstring(body, 'DeleteResult')
+        resp_objects = elem.findall('Deleted')
+        self.assertEquals(len(resp_objects), len(req_objects))
+        for o in resp_objects:
+            self.assertTrue(o.find('Key').text in req_objects)

swift3/test/functional/utils.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from hashlib import md5
 from swift3.etree import fromstring
 
 
@@ -27,3 +28,7 @@ def assert_common_response_headers(self, headers):
 def get_error_code(body):
     elem = fromstring(body, 'Error')
     return elem.find('Code').text
+
+
+def calculate_md5(body):
+    return md5(body).digest().encode('base64').strip()