fixup! fixup! fixup! test ingestion of non versioned objets

Author: Kerkesni

tests/zenko_tests/node_tests/backbeat/tests/ingestion/ingestionS3C.js

@@ -19,26 +19,31 @@ let KEY_PREFIX;
 let OBJ_KEY;
 
 describe('Ingesting existing data from RING S3C bucket', () => {
-    beforeEach(() => {
+    beforeEach(function () {
         INGESTION_DEST_BUCKET = `ingestion-${uuid()}`;
         KEY_PREFIX = `${ingestionSrcBucket}-${uuid()}`;
         OBJ_KEY = `${KEY_PREFIX}/object-to-ingest-${uuid()}`;
+        this.testState = {
+            s3cBucketToClean: ingestionSrcBucket,
+        };
     });
 
-    afterEach(done => async.series([
-        next => ringS3CUtils.deleteAllVersions(
-            ingestionSrcBucket,
-            null,
-            next,
-        ),
-        next => ringS3CUtils.putBucketVersioning(
-            ingestionSrcBucket,
-            'Enabled',
-            next,
-        ),
-        next => scalityUtils.waitUntilEmpty(INGESTION_DEST_BUCKET, next),
-        next => scalityUtils.deleteVersionedBucket(INGESTION_DEST_BUCKET, next),
-    ], done));
+    afterEach(function (done) {
+        async.series([
+            next => ringS3CUtils.deleteAllVersions(
+                this.testState.s3cBucketToClean,
+                null,
+                next,
+            ),
+            next => ringS3CUtils.putBucketVersioning(
+                this.testState.s3cBucketToClean,
+                'Enabled',
+                next,
+            ),
+            next => scalityUtils.waitUntilEmpty(INGESTION_DEST_BUCKET, next),
+            next => scalityUtils.deleteVersionedBucket(INGESTION_DEST_BUCKET, next),
+        ], done);
+    });
 
     it('should ingest an object', done => async.waterfall([
         // object
@@ -366,28 +371,32 @@ describe('Ingesting existing data from RING S3C bucket', () => {
     // for the location to be created, and once it's versioned can't be set to non versioned again. This is
     // done to avoid having to create the location during the tests which might impact other tests running
     // in parallel.
-    it('should ingest all non versioned objects', done => async.waterfall([
-        next => scalityUtils.createIngestionBucket(
-            INGESTION_DEST_BUCKET,
-            srcNonVersionedLocation,
-            next,
-        ),
-        next => ringS3CUtils.s3.listObjectVersions({
-            Bucket: ingestionNonVersionedSrcBucket,
-        }, next),
-        (data, next) => {
-            assert.strictEqual(data.Versions.length, nonVersionedObjectCount);
-            assert.strictEqual(data.DeleteMarkers.length, 0);
-            async.forEach(data.Versions, (version, cb) => {
-                scalityUtils.compareObjectsRINGS3C(
-                    ingestionNonVersionedSrcBucket,
-                    INGESTION_DEST_BUCKET,
-                    version.Key,
-                    'null',
-                    undefined,
-                    cb,
-                );
-            }, next);
-        },
-    ], done));
+    it('should ingest all non versioned objects', function (done) {
+        this.testState.s3cBucketToClean = ingestionNonVersionedSrcBucket;
+        async.waterfall([
+            next => scalityUtils.createIngestionBucket(
+                INGESTION_DEST_BUCKET,
+                srcNonVersionedLocation,
+                next,
+            ),
+            next => ringS3CUtils.s3.listObjectVersions({
+                Bucket: ingestionNonVersionedSrcBucket,
+            }, next),
+            (data, next) => {
+                assert.strictEqual(data.Versions.length, nonVersionedObjectCount);
+                assert.strictEqual(data.DeleteMarkers.length, 0);
+                async.forEach(data.Versions, (version, cb) => {
+                    scalityUtils.compareObjectsRINGS3C(
+                        ingestionNonVersionedSrcBucket,
+                        INGESTION_DEST_BUCKET,
+                        version.Key,
+                        'null',
+                        undefined,
+                        cb,
+                    );
+                }, next);
+            },
+        ], done);
+    });
 });
+