additionnal fixups

Author: benzekrimaha

tests/sur/quota.js

@@ -177,9 +177,6 @@ function objectMPU(bucket, key, parts, partSize, callback) {
         Bucket: bucket,
         Key: key,
     };
-    if (!s3Config.isQuotaInflightEnabled()) {
-        mockScuba.incrementBytesForBucket(bucket, parts * partSize);
-    }
     return async.waterfall([
         next => s3Client.send(new CreateMultipartUploadCommand(initiateMPUParams))
             .then(data => {
@@ -231,12 +228,6 @@ 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,
@@ -248,14 +239,7 @@ function abortMPU(bucket, key, uploadId, size, callback) {
             }
             return callback(null, data);
         })
-        .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);
-        });
+        .catch(err => callback(err));
 }
 
 function uploadPartCopy(bucket, key, partNumber, partSize, sleepDuration, keyToCopy, callback) {