CLDSRV-808: PUT/GET bucket logging fix test cleanup

Author: leif-scality

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

@@ -13,23 +13,31 @@ const validLoggingConfig = {
     },
 };
 
+function cleanUp(bucketUtil, cb) {
+    Promise.all([
+        bucketUtil.deleteOne(bucketName).catch(err => {
+            if (err && err.code !== 'NoSuchBucket') {
+                throw err;
+            }
+        }),
+        bucketUtil.deleteOne(targetBucket).catch(err => {
+            if (err && err.code !== 'NoSuchBucket') {
+                throw err;
+            }
+        }),
+    ]).then(() => cb()).catch(err => cb(err));
+}
+
 describe('GET bucket logging', () => {
     withV4(sigCfg => {
         const bucketUtil = new BucketUtility('default', sigCfg);
         const s3 = bucketUtil.s3;
 
-        afterEach(done => {
-            process.stdout.write('Deleting buckets\n');
-            bucketUtil.deleteOne(bucketName).then(() => bucketUtil.deleteOne(targetBucket)).then(() => done())
-            .catch(err => {
-                if (err && err.code !== 'NoSuchBucket') {
-                    return done(err);
-                }
-                return done();
-            });
-        });
+        after(done => { cleanUp(bucketUtil, done); });
 
         describe('without existing bucket', () => {
+            afterEach(done => { cleanUp(bucketUtil, done); });
+
             it('should return NoSuchBucket', done => {
                 s3.getBucketLogging({ Bucket: bucketName }, err => {
                     assert(err);
@@ -41,7 +49,9 @@ describe('GET bucket logging', () => {
         });
 
         describe('on bucket without logging configuration', () => {
-            before(done => {
+            afterEach(done => { cleanUp(bucketUtil, done); });
+
+            beforeEach(done => {
                 process.stdout.write('Creating bucket without logging\n');
                 s3.createBucket({ Bucket: bucketName }, err => {
                     if (err) {
@@ -65,7 +75,9 @@ describe('GET bucket logging', () => {
         });
 
         describe('with existing logging configuration', () => {
-            before(done => {
+            afterEach(done => { cleanUp(bucketUtil, done); });
+
+            beforeEach(done => {
                 process.stdout.write('Creating buckets and setting logging\n');
                 return s3.createBucket({ Bucket: bucketName }, err => {
                     if (err) {

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

@@ -57,6 +57,21 @@ describe('PUT bucket logging', () => {
             });
         }
 
+        after(done => {
+            Promise.all([
+                bucketUtil.deleteOne(bucketName).catch(err => {
+                    if (err && err.code !== 'NoSuchBucket') {
+                        throw err;
+                    }
+                }),
+                bucketUtil.deleteOne(targetBucket).catch(err => {
+                    if (err && err.code !== 'NoSuchBucket') {
+                        throw err;
+                    }
+                }),
+            ]).then(() => done()).catch(err => done(err));
+        });
+
         describe('without existing bucket', () => {
             it('should return NoSuchBucket', done => {
                 _testPutBucketLoggingError(s3, validLoggingConfig, 404, 'NoSuchBucket', done);
@@ -209,7 +224,6 @@ describe('PUT bucket logging', () => {
                         TargetPrefix: 'logs/',
                     },
                 };
-                
                 s3.putBucketLogging({
                     Bucket: bucketName,
                     BucketLoggingStatus: crossAccountConfig,