fixups on versionning tests

Author: benzekrimaha

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

@@ -28,16 +28,15 @@ function _deleteVersionList(versionList, bucket, callback) {
     return s3Client.send(new DeleteObjectsCommand(params)).then(() => callback()).catch(err => callback(err));
 }
 
-function checkOneVersion(s3, bucket, versionId, callback) {
+function checkOneVersion(s3, bucket, versionId) {
     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));
+            assert.strictEqual(data.DeleteMarkers?.length, undefined);
+        });
 }
 
 function removeAllVersions(params, callback) {

tests/functional/aws-node-sdk/test/versioning/objectDelete.js

@@ -46,8 +46,15 @@ describe('delete marker creation in bucket with null version', () => {
         });
 
         afterEach(async () => {
-            await removeAllVersionsPromise({ Bucket: bucket });
-            await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
+            try {
+                await removeAllVersionsPromise({ Bucket: bucket });
+                await bucketUtil.empty(bucket);
+                await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
+            } catch (err) {
+                if (err.name !== 'NoSuchBucket') {
+                    throw err;
+                }
+            }
         });
 
         it('should keep the null version if versioning enabled', async () => {
@@ -114,11 +121,12 @@ describe('aws-node-sdk test delete object', () => {
         after(async () => {
             try {
                 await removeAllVersionsPromise({ Bucket: bucket });
+                await bucketUtil.empty(bucket);
+                await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
             } catch (err) {
-                if (err.code !== 'NoSuchBucket') {
-                   throw err;
+                if (err.name !== 'NoSuchBucket') {
+                    throw err;
                 }
-                await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
             }
         });
 
@@ -518,21 +526,18 @@ describe('aws-node-sdk test concurrent version-specific deletes with null', () =
         const bucketUtil = new BucketUtility('default', sigCfg);
         const s3 = bucketUtil.s3;
 
-        // setup test
-        before(async () => {
-            await s3.send(new CreateBucketCommand({ Bucket: bucket }));
-        });
+        before(() => s3.send(new CreateBucketCommand({ Bucket: bucket })));
 
-        // delete bucket after testing
         after(async () => {
             try {
                 await removeAllVersionsPromise({ Bucket: bucket });
+                await bucketUtil.empty(bucket);
+                await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
             } catch (err) {
-                if (err.Code !== 'NoSuchBucket') {
+                if (err.name !== 'NoSuchBucket') {
                     throw err;
                 }
             }
-            await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
         });
 
         it('creating non-versioned object', async () => {

tests/functional/aws-node-sdk/test/versioning/objectDeleteTagging.js

@@ -25,7 +25,7 @@ const {
 
 function _checkError(err, code, statusCode) {
     assert(err, 'Expected error but found none');
-    assert.strictEqual(err.Code, code);
+    assert.strictEqual(err.name, code);
     assert.strictEqual(err.$metadata?.httpStatusCode, statusCode);
 }
 
@@ -41,6 +41,7 @@ describe('Delete object tagging with versioning', () => {
 
         afterEach(async () => {
             await removeAllVersions({ Bucket: bucketName });
+            await bucketUtil.empty(bucketName);
             await s3.send(new DeleteBucketCommand({ Bucket: bucketName }));
         });
 

tests/functional/aws-node-sdk/test/versioning/objectGet.js

@@ -50,6 +50,7 @@ describe('get behavior on versioning-enabled bucket', () => {
 
         afterEach(async () => {
             await removeAllVersions({ Bucket: bucket });
+            await bucketUtil.empty(bucket);
             await s3.send(new DeleteBucketCommand({ Bucket: bucket }));
         });