fixup

Author: benzekrimaha

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

@@ -81,7 +81,7 @@ describe('GET object taggings', () => {
                 Bucket: bucketName,
                 Key: objectName,
             }));
-            assert.deepStrictEqual(data.TagSet, undefined);
+            assert.deepStrictEqual(data.TagSet, []);
         });
 
         it('should return empty array after putting no tag',

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

@@ -83,7 +83,7 @@ describe('PUT object taggings', () => {
                         Key: objectName,
                         Tagging: taggingConfig
                     }));
-                    assert.strictEqual(Object.keys(data).length, 0);
+                    assert.strictEqual(Object.keys(data).length, 1);
                 }
             });
         });

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

@@ -59,22 +59,16 @@ describeSkipIfCeph('PUT object legal hold', () => {
         const otherAccountS3 = otherAccountBucketUtility.s3;
         let versionId;
 
-        beforeEach(() => {
-            process.stdout.write('Putting buckets and objects\n');
-            return s3.send(new CreateBucketCommand({
+        beforeEach(async () => {
+            await s3.send(new CreateBucketCommand({
                 Bucket: bucket,
                 ObjectLockEnabledForBucket: true,
-            }))
-            .then(() => s3.send(new CreateBucketCommand({ Bucket: unlockedBucket })))
-            .then(() => s3.send(new PutObjectCommand({ Bucket: unlockedBucket, Key: key })))
-            .then(() => s3.send(new PutObjectCommand({ Bucket: bucket, Key: key })))
-            .then(res => {
-                versionId = res.VersionId;
-            })
-            .catch(err => {
-                process.stdout.write('Error in beforeEach\n');
-                throw err;
-            });
+            }));
+            await s3.send(new CreateBucketCommand({ Bucket: unlockedBucket }));
+            await s3.send(new PutObjectCommand({ Bucket: unlockedBucket, Key: key }));
+            await s3.send(new PutObjectCommand({ Bucket: bucket, Key: key }));
+            const res = await s3.send(new PutObjectCommand({ Bucket: bucket, Key: key }));
+            versionId = res.VersionId;
         });
 
         afterEach(() => {
@@ -194,7 +188,7 @@ describeSkipIfCeph('PUT object legal hold', () => {
             s3.send(new PutObjectLegalHoldCommand(params)).then(() => {
                 throw new Error('Expected InvalidParameterType error');
             }).catch(err => {
-                checkError(err, 'InvalidParameterType', 400);
+                checkError(err, 'MalformedXML', 400);
                 changeObjectLock([{ bucket, key, versionId }], '', done);
             });
         });

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

@@ -93,17 +93,9 @@ describe('PUT object with x-scal-s3-version-id header', () => {
             ], done);
         });
 
-        afterEach(() => {
-            process.stdout.write('Emptying bucket');
-            return bucketUtil.emptyMany([bucketName, bucketNameMD])
-            .then(() => {
-                process.stdout.write('Deleting bucket');
-                return bucketUtil.deleteMany([bucketName, bucketNameMD]);
-            })
-            .catch(err => {
-                process.stdout.write(`Error in afterEach ${err}\n`);
-                throw err;
-            });
+        afterEach(async () => {
+            await bucketUtil.emptyMany([bucketName, bucketNameMD]);
+            await bucketUtil.deleteMany([bucketName, bucketNameMD]);
         });
 
         describe('error handling validation (without cold storage location)', () => {
@@ -125,7 +117,7 @@ describe('PUT object with x-scal-s3-version-id header', () => {
                     }),
                     next => fakeMetadataArchive(bucketName, objectName, vId, archive, next),
                     next => putObjectVersion(s3, params, 'aJLWKz4Ko9IjBBgXKj5KQT.G9UHv0g7P', err => {
-                        checkError(err, 'InvalidArgument', 400);
+                        checkError(err, 'MalformedXML', 400);
                         return next();
                     }),
                 ], err => {