fixups

Author: benzekrimaha

tests/sur/quota.js

@@ -183,8 +183,6 @@ function objectMPU(bucket, key, parts, partSize, callback) {
     return async.waterfall([
         next => s3Client.send(new CreateMultipartUploadCommand(initiateMPUParams))
             .then(data => {
-                // eslint-disable-next-line no-console
-                console.log('Initiated multipart upload:', data);
                 uploadId = data.UploadId;
                 return next();
             })
@@ -199,9 +197,7 @@ function objectMPU(bucket, key, parts, partSize, callback) {
                     Body: Buffer.alloc(partSize),
                 };
                 return s3Client.send(new UploadPartCommand(uploadPartParams))
-                    .then(data => {
-                        return callback(null, data.ETag);
-                    })
+                    .then(data => callback(null, data.ETag))
                     .catch(callback);
             }, (err, results) => {
                 if (err) {
@@ -223,7 +219,7 @@ function objectMPU(bucket, key, parts, partSize, callback) {
                 UploadId: uploadId,
             };
             return s3Client.send(new CompleteMultipartUploadCommand(params))
-                .then(() => next())
+                .then( data => next(null, data))
                 .catch(next);
         },
     ], err => {
@@ -235,6 +231,12 @@ function objectMPU(bucket, key, parts, partSize, callback) {
 }
 
 function abortMPU(bucket, key, uploadId, size, callback) {
+    // Handle case where uploadId is null/undefined
+    if (!uploadId) {
+        console.log('Warning: Attempted to abort MPU with null uploadId');
+        return callback();
+    }
+    
     return s3Client.send(new AbortMultipartUploadCommand({
         Bucket: bucket,
         Key: key,
@@ -246,7 +248,14 @@ function abortMPU(bucket, key, uploadId, size, callback) {
             }
             return callback(null, data);
         })
-        .catch(err => callback(err));
+        .catch(err => {
+            // Don't fail the test if the abort fails due to the MPU not existing
+            if (err.name === 'NoSuchUpload') {
+                console.log('MPU already cleaned up or does not exist');
+                return callback();
+            }
+            return callback(err);
+        });
 }
 
 function uploadPartCopy(bucket, key, partNumber, partSize, sleepDuration, keyToCopy, callback) {
@@ -489,6 +498,8 @@ function multiObjectDelete(bucket, keys, size, callback) {
                 next => sendRequest(putQuotaVerb, '127.0.0.1:8000', `/${bucket}/?quota=true`,
                     JSON.stringify(quota), config).then(() => next()).catch(err => next(err)),
                 next => objectMPU(bucket, key, parts, partSize, (err, _uploadId) => {
+                    // eslint-disable-next-line no-console
+                    console.log('objectMPU', _uploadId);
                     uploadId = _uploadId;
                     try {
                         assert.strictEqual(err.name, 'QuotaExceeded');
@@ -971,9 +982,7 @@ function multiObjectDelete(bucket, keys, size, callback) {
                         } catch (assertError) {
                             return next(assertError);
                         }
-                    }),
-                    // Simulate the real restore
-                    next => putObjectWithCustomHeader(bucket, key, size, vID, err => {
+, err => {
                         assert.ifError(err);
                         return next();
                     }),