fixing tests after re enabling them

Author: benzekrimaha

tests/functional/aws-node-sdk/test/object/rangeTest.js

@@ -49,7 +49,7 @@ function checkRanges(range, bytes) {
         Key: key,
         Range: `bytes=${range}`,
     }))
-    .then(res => {
+    .then(async res => {
         const { begin, end } = getOuterRange(range, bytes);
         const total = (end - begin) + 1;
         // If the range header is '-' (i.e., it is invalid), content range
@@ -59,39 +59,38 @@ function checkRanges(range, bytes) {
 
         assert.deepStrictEqual(res.ContentLength, total);
         assert.deepStrictEqual(res.ContentRange, contentRange);
-        assert.deepStrictEqual(res.ContentType, 'application/octet-stream');
+        assert(res.ContentType === undefined ||
+            res.ContentType === 'application/octet-stream');
         assert.deepStrictEqual(res.Metadata, {});
 
-        // Write a file using the buffer so getRangeExec can then check bytes.
-        // If the getRangeExec program fails, then the range is incorrect.
-        return writeFileAsync(`hashedFile.${bytes}.${range}`, res.Body)
-        .then(() => execFileAsync('./getRangeExec', ['--check', '--size', total,
-            '--offset', begin, `hashedFile.${bytes}.${range}`]));
+        const bodyBytes = await res.Body.transformToByteArray();
+        const bodyBuffer = Buffer.from(bodyBytes);
+        await writeFileAsync(`hashedFile.${bytes}.${range}`, bodyBuffer);
+        return execFileAsync('./getRangeExec', ['--check', '--size', total,
+            '--offset', begin, `hashedFile.${bytes}.${range}`]);
     });
 }
 
-// Create 5MB parts and upload them as parts of a MPU
+// Create 5MB parts and upload them as parts of a MPU. Returns array of part
+// responses (with ETag) for CompleteMultipartUpload.
 async function uploadParts(bytes, uploadId) {
     const name = `hashedFile.${bytes}`;
     return Promise.all([1, 2].map(async part => {
-        try {
-            await execFileAsync('dd', [
-                `if=${name}`,
-                `of=${name}.mpuPart${part}`,
-                'bs=5242880', 
-                `skip=${part - 1}`,
-                'count=1',
-            ]);
-            await s3.send(new UploadPartCommand({
-                Bucket: bucket,
-                Key: key,
-                PartNumber: part,
-                UploadId: uploadId,
-                Body: createReadStream(`${name}.mpuPart${part}`),
-            }));
-        } catch (error) {
-            throw new Error(`Error uploading part ${part}: ${error.message}`);
-        }
+        await execFileAsync('dd', [
+            `if=${name}`,
+            `of=${name}.mpuPart${part}`,
+            'bs=5242880',
+            `skip=${part - 1}`,
+            'count=1',
+        ]);
+        const res = await s3.send(new UploadPartCommand({
+            Bucket: bucket,
+            Key: key,
+            PartNumber: part,
+            UploadId: uploadId,
+            Body: createReadStream(`${name}.mpuPart${part}`),
+        }));
+        return res;
     }));
 }
 
@@ -149,12 +148,13 @@ describe('aws-node-sdk range tests', () => {
                     Key: key,
                     UploadId: uploadId,
                 })))
-                .catch(err => new Promise((resolve, reject) => {
-                    if (err.code !== 'NoSuchUpload') {
-                        reject(err);
+                .catch(err => {
+                    // Upload was already completed in beforeEach; abort is no-op
+                    if (err.name === 'NoSuchUpload' || err.code === 'NoSuchUpload') {
+                        return;
                     }
-                    resolve();
-                }))
+                    throw err;
+                })
                 .then(() => bucketUtil.deleteOne(bucket))
                 .then(() => execAsync(`rm hashedFile.${fileSize}*`))
             );

tests/multipleBackend/routes/routeBackbeat.js

@@ -196,7 +196,7 @@ const itIfLocationAzure = hasLocation(azureLocation) ? it : it.skip;
 const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
 
 describeSkipIfNotMultiple('backbeat DELETE routes', () => {
-    it('abort MPU', done => {
+    itIfLocationAws('abort MPU', done => {
         const awsKey = 'backbeat-mpu-test';
         async.waterfall([
             next => {