fixup

Author: benzekrimaha

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

@@ -81,29 +81,12 @@ describe('Object Copy', () => {
         let etagTrim;
         let lastModified;
 
-        before(() => {
+        before(async () => {
             bucketUtil = new BucketUtility('default', sigCfg);
             s3 = bucketUtil.s3;
-            return bucketUtil.empty(sourceBucketName)
-            .then(() =>
-                bucketUtil.empty(destBucketName)
-            )
-            .then(() =>
-                bucketUtil.deleteMany([sourceBucketName, destBucketName])
-            )
-            .catch(err => {
-                if (err.name !== 'NoSuchBucket') {
-                    process.stdout.write(`${err}\n`);
-                    throw err;
-                }
-            })
-            .then(() => bucketUtil.createOne(sourceBucketName)
-            )
-            .then(() => bucketUtil.createOne(destBucketName)
-            )
-            .catch(err => {
-                throw err;
-            });
+            await bucketUtil.empty(sourceBucketName);
+            await bucketUtil.empty(destBucketName);
+            await bucketUtil.deleteMany([sourceBucketName, destBucketName]);
         });
 
          beforeEach(() => s3.send(new PutObjectCommand({
@@ -126,10 +109,13 @@ describe('Object Copy', () => {
         }).then(res => {
             lastModified = res.LastModified;
         }));
-        afterEach(() => bucketUtil.empty(sourceBucketName)
-                .then(() => bucketUtil.empty(destBucketName)));
 
-        after(() => bucketUtil.deleteMany([sourceBucketName, destBucketName]));
+        afterEach(async () => {
+            await bucketUtil.empty(sourceBucketName, true);
+            await bucketUtil.empty(destBucketName, true);
+        });
+
+        after(async() => await bucketUtil.deleteMany([sourceBucketName, destBucketName]));
 
         function requestCopy(fields, cb) {
             s3.send(new CopyObjectCommand(Object.assign({
@@ -363,12 +349,11 @@ describe('Object Copy', () => {
             });
 
         it('should copy an object from a source bucket to a different ' +
-            'key in the same bucket',
-            async () => {
-                    const res = await s3.send(new CopyObjectCommand({ Bucket: sourceBucketName, Key: destObjName,
-                        CopySource: `${sourceBucketName}/${sourceObjName}` }));
-                    await successCopyCheck(null, res.CopyObjectResult, originalMetadata,
-                        sourceBucketName, destObjName);
+            'key in the same bucket', async () => {
+                const res = await s3.send(new CopyObjectCommand({ Bucket: sourceBucketName, Key: destObjName,
+                    CopySource: `${sourceBucketName}/${sourceObjName}` }));
+                await successCopyCheck(null, res.CopyObjectResult, originalMetadata,
+                    sourceBucketName, destObjName);
             });
 
         // TODO: see S3C-3482, figure out why this test fails in Integration builds
@@ -1340,7 +1325,7 @@ describe('Object Copy', () => {
             });
         });
 
-        it('should copy restored object and reset storage class', done => {
+        it.only('should copy restored object and reset storage class', done => {
             const archiveCompleted = {
                 archiveInfo: {},
                 restoreRequestedAt: new Date(0),
@@ -1355,9 +1340,11 @@ describe('Object Copy', () => {
                     Key: destObjName,
                     CopySource: `${sourceBucketName}/${sourceObjName}`,
                 })).then(res => {
+                    console.log('COPY RES', res);
                     successCopyCheck(null, res.CopyObjectResult, originalMetadata,
                         destBucketName, destObjName, done);
                 }).catch(err => {
+                    console.log('COPY ERR', err);
                     checkNoError(err);
                     done();
                 });