test_s3: Only abort the multipart-upload if it did not complete

tests/integration/test_s3.py

@@ -248,24 +248,27 @@ def test_can_create_object_directly(self):
     def test_s3_multipart(self):
         # Create the multipart upload
         mpu = self.bucket.Object('mp-test.txt').initiate_multipart_upload()
-        self.addCleanup(mpu.abort)
-
-        # Create and upload a part
-        part = mpu.Part(1)
-        response = part.upload(Body='hello, world!')
-
-        # Complete the upload, which requires info on all of the parts
-        part_info = {
-            'Parts': [
-                {
-                    'PartNumber': 1,
-                    'ETag': response['ETag']
-                }
-            ]
-        }
+        try:
+            # Create and upload a part
+            part = mpu.Part(1)
+            response = part.upload(Body='hello, world!')
+
+            # Complete the upload, which requires info on all of the parts
+            part_info = {
+                'Parts': [
+                    {
+                        'PartNumber': 1,
+                        'ETag': response['ETag']
+                    }
+                ]
+            }
 
-        mpu.complete(MultipartUpload=part_info)
-        self.addCleanup(self.bucket.Object('mp-test.txt').delete)
+            mpu.complete(MultipartUpload=part_info)
+        except Exception:
+            self.addCleanup(mpu.abort)
+            raise
+        else:
+            self.addCleanup(self.bucket.Object('mp-test.txt').delete)
 
         contents = self.bucket.Object('mp-test.txt').get()['Body'].read()
         self.assertEqual(contents, b'hello, world!')