fixup after merge all

Author: SylvainSenechal

tests/functional/aws-node-sdk/lib/utility/versioning-util.js

@@ -28,15 +28,13 @@ function _deleteVersionList(versionList, bucket, callback) {
     return s3Client.send(new DeleteObjectsCommand(params)).then(() => callback()).catch(err => callback(err));
 }
 
-function checkOneVersion(s3, bucket, versionId, callback) {
-    return s3Client.send(new ListObjectVersionsCommand({ Bucket: bucket })).then(data => {
-            assert.strictEqual(data.Versions.length, 1);
-            if (versionId) {
-                assert.strictEqual(data.Versions[0].VersionId, versionId);
-            }
-            assert.strictEqual(data.DeleteMarkers.length, 0);
-            callback();
-        }).catch(err => callback(err));
+async function checkOneVersion(s3, bucket, versionId) {
+    const data = await s3.send(new ListObjectVersionsCommand({ Bucket: bucket }));
+    assert.strictEqual(data.Versions.length, 1);
+    if (versionId) {
+        assert.strictEqual(data.Versions[0].VersionId, versionId);
+    }
+    assert.strictEqual((data.DeleteMarkers || []).length, 0);
 }
 
 function removeAllVersions(params, callback) {
@@ -106,7 +104,11 @@ function enableVersioningThenPutObject(bucket, object, callback) {
 function createDualNullVersion(s3, bucketName, keyName, cb) {
     async.waterfall([
         // put null version
-        next => s3Client.send(new PutObjectCommand({ Bucket: bucketName, Key: keyName, Body: null })).then(() => 
+        next => s3Client.send(new PutObjectCommand({
+            Bucket: bucketName,
+            Key: keyName,
+            Body: Buffer.from(''),
+        })).then(() =>
             next()).catch(err => next(err)),
         next => enableVersioning(bucketName, err => next(err)),
         // should store null version as separate version before

tests/functional/aws-node-sdk/test/bucket/getBucketLogging.js

@@ -21,12 +21,12 @@ const validLoggingConfig = {
 function cleanUp(bucketUtil, cb) {
     Promise.all([
         bucketUtil.deleteOne(bucketName).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),
         bucketUtil.deleteOne(targetBucket).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),

tests/functional/aws-node-sdk/test/bucket/putBucketLogging.js

@@ -46,12 +46,12 @@ const itSkipIfAWS = process.env.AWS_ON_AIR ? it.skip : it;
 function cleanUp(bucketUtil, cb) {
     Promise.all([
         bucketUtil.deleteOne(bucketName).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),
         bucketUtil.deleteOne(targetBucket).catch(err => {
-            if (err && err.code !== 'NoSuchBucket') {
+            if (err && err.name !== 'NoSuchBucket') {
                 throw err;
             }
         }),

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

@@ -103,15 +103,12 @@ describe('large mpu', function tester() {
                     })
                     .catch(err => next(err));
             },
-            next => {
-                return timesLimit(partCount, 20, (n, cb) =>
-                    uploadPart(n, uploadId, s3, cb), err => {
-                        if (err) {
-                            process.stdout.write(`Error in timesLimit: ${err}\n`);
-                        }
-                        return next(err);
-                    });
-            },
+            next => timesLimit(partCount, 20, (n, cb) => uploadPart(n, uploadId, s3, cb), err => {
+                if (err) {
+                    process.stdout.write(`Error in timesLimit: ${err}\n`);
+                }
+                return next(err);
+            }),
             next => {
                 const parts = [];
                 for (let i = 0; i < partCount; i++) {