continue refactor 2

SylvainSenechal · SylvainSenechal · commit 9ba51a24d520 · 2025-10-08T10:31:04.000+02:00
diff --git a/tests/zenko_tests/node_tests/backbeat/IngestionUtility.js b/tests/zenko_tests/node_tests/backbeat/IngestionUtility.js
@@ -109,36 +109,26 @@ class IngestionUtility extends ReplicationUtility {
 
     waitUntilIngested(bucketName, key, versionId, cb) {
         let status;
-        let attemptCount = 0;
-        const maxAttempts = 90; // 3 minutes max (90 * 2 seconds = 180 seconds)
         const expectedCode = 'NotFound';
         return async.doWhilst(
-            callback => {
-                attemptCount++;
-                if (attemptCount > maxAttempts) {
-                    return callback(new Error(`Ingestion timeout: Object ${bucketName}/${key} not ingested after ${maxAttempts * 2} seconds`));
-                }
-                this.s3.send(new HeadObjectCommand({
-                    Bucket: bucketName,
-                    Key: key,
-                    VersionId: versionId,
-                }))
-                    .then(() => {
-                        status = true;
-                        return callback();
-                    })
-                    .catch(err => {
-                        if (err.name !== expectedCode) {
-                            return callback(err);
-                        }
-                        status = false;
-                        return setTimeout(callback, 2000);
-                    });
-            },
+            callback => this.s3.send(new HeadObjectCommand({
+                Bucket: bucketName,
+                Key: key,
+                VersionId: versionId,
+            }))
+                .then(() => {
+                    status = true;
+                    return callback();
+                })
+                .catch(err => {
+                    if (err.name !== expectedCode) {
+                        return callback(err);
+                    }
+                    status = false;
+                    return setTimeout(callback, 2000);
+                }),
             () => !status,
-            err => {
-                cb(err);
-            },
+            cb,
         );
     }
 
diff --git a/tests/zenko_tests/node_tests/backbeat/ReplicationUtility.js b/tests/zenko_tests/node_tests/backbeat/ReplicationUtility.js
@@ -61,8 +61,6 @@ class ReplicationUtility {
             return cb();
         }
 
-        // Use individual DeleteObjectCommand calls for all S3 clients to avoid Content-MD5 issues
-        // This is more reliable than DeleteObjectsCommand and works consistently across all S3-compatible endpoints
         const deletePromises = versionList.map(item => {
             const params = {
                 Bucket: bucketName,
@@ -74,13 +72,9 @@ class ReplicationUtility {
             return this.s3.send(new DeleteObjectCommand(params));
         });
 
-        Promise.all(deletePromises)
-            .then(() => {
-                cb();
-            })
-            .catch(err => {
-                cb(err);
-            });
+        return Promise.all(deletePromises)
+            .then(() => cb())
+            .catch(err => cb(err));
     }
 
     _setS3Client(s3Client) {
diff --git a/tests/zenko_tests/node_tests/backbeat/tests/crr/awsBackend.js b/tests/zenko_tests/node_tests/backbeat/tests/crr/awsBackend.js
@@ -18,7 +18,7 @@ const copyKey = `${key}-copy`;
 const copySource = `/${srcBucket}/${key}`;
 // eslint-disable-next-line
 const keyutf8 = `${keyPrefix}/%EA%9D%8崰㈌㒈保轖䳷䀰⺩ቆ楪僷ꈅꓜ퇬枅࿷염곞召㸾⌙ꪊᆐ庍뉆䌗↎幐냂詴 끴鹲萯⇂쫤ᛩ꺶㖭簹릍铰᫫暨鿐魪셑蛃춧㡡竺뫁噛̷ᗰⷑ錜⑔痴䧫㾵᏷ำꎆ꼵껪멷㄀誕㳓腜쒃컹㑻鳃삚舿췈孨੦⮀Ǌ곓⵪꺼꜈嗼뫘悕錸瑺⁤⑬১㵀⡸Ҏ礄䧛졼⮦ٞ쫁퓡垻ㆩꝿ詀펉ᆙ舑䜾힑藪碙ꀎꂰ췊Ᏻ   㘺幽醛잯ද汧Ꟑꛒⶨ쪸숞헹㭔ꡔᘼ뺓ᡆ᡾ᑟ䅅퀭耓弧⢠⇙폪ް蛧⃪Ἔ돫ꕢ븥ヲ캂䝄쟐颺ᓾ둾Ұ껗礞ᾰ瘹蒯硳풛瞋襎奺熝妒컚쉴⿂㽝㝳駵鈚䄖戭䌸᫲ᇁ䙪鸮ᐴ稫ⶭ뀟ھ⦿䴳稉ꉕ捈袿놾띐✯伤䃫⸧ꠏ瘌틳藔ˋ㫣敀䔩㭘식↴⧵佶痊牌ꪌ搒꾛æᤈべ쉴挜炩⽍舘ꆗ줣徭Z䐨 敗羥誜嘳ֶꫜ걵ࣀ묟ኋ拃秷䨸菥䟆곘縧멀煣⧃⏶혣뎧邕⢄⭖陙䣎灏ꗛ僚䌁䠒䲎둘ꪎ傩쿌ᨌ뀻阥눉넠猌ㆯ㰢船戦跏灳蝒礯鞰諾벥煸珬㟑孫鞹Ƭꄹ孙ꢱ钐삺ᓧ鈠䁞〯蘼᫩헸ῖ"`;
-const REPLICATION_TIMEOUT = 500000;
+const REPLICATION_TIMEOUT = 300000;
 
 describe('Replication with AWS backend', function () {
     // eslint-disable-next-line
diff --git a/tests/zenko_tests/node_tests/backbeat/tests/ingestion/ingestionS3C.js b/tests/zenko_tests/node_tests/backbeat/tests/ingestion/ingestionS3C.js
@@ -56,25 +56,15 @@ describe('Ingesting existing data from RING S3C bucket', () => {
                 ingestionSrcBucket,
                 OBJ_KEY,
                 Buffer.alloc(1),
-                (err, objData) => {
-                    if (err) {
-                        return next(err);
-                    }
-                    next(err, objData);
-                },
+                next,
             );
         },
         // create ingestion bucket
         (objData, next) => {
             scalityUtils.createIngestionBucket(
                 INGESTION_DEST_BUCKET,
                 location,
-                err => {
-                    if (err) {
-                        return next(err, objData);
-                    }
-                    next(err, objData);
-                },
+                err => next(err, objData),
             );
         },
         // compare object
@@ -85,12 +75,7 @@ describe('Ingesting existing data from RING S3C bucket', () => {
                 OBJ_KEY,
                 objData.VersionId,
                 undefined,
-                err => {
-                    if (err) {
-                        return next(err);
-                    }
-                    next();
-                },
+                next,
             );
         },
     ], done));
@@ -409,9 +394,7 @@ describe('Ingesting existing data from RING S3C bucket', () => {
                 scalityUtils.createIngestionBucket(
                     INGESTION_DEST_BUCKET,
                     srcNonVersionedLocation,
-                    (err) => {
-                        next(err);
-                    },
+                    next,
                 );
             },
             next => {
@@ -429,35 +412,20 @@ describe('Ingesting existing data from RING S3C bucket', () => {
                 // Handle case where Versions or DeleteMarkers might be undefined/null
                 const versions = data.Versions || [];
                 const deleteMarkers = data.DeleteMarkers || [];
-                if (versions.length !== nonVersionedObjectCount) {
-                    const error = new Error(`Expected ${nonVersionedObjectCount} objects but found ${versions.length} in bucket ${ingestionNonVersionedSrcBucket}`);
-                    return next(error);
-                }
-
-                if (deleteMarkers.length !== 0) {
-                    const error = new Error(`Expected 0 delete markers but found ${deleteMarkers.length} in bucket ${ingestionNonVersionedSrcBucket}`);
-                    return next(error);
-                }
-
-                // Process objects serially to avoid overwhelming the ingestion service
-                async.forEachSeries(versions, (version, cb) => {
+                assert.strictEqual(versions.length, nonVersionedObjectCount);
+                assert.strictEqual(deleteMarkers.length, 0);
+                async.forEach(versions, (version, cb) => {
                     scalityUtils.compareObjectsRINGS3C(
                         ingestionNonVersionedSrcBucket,
                         INGESTION_DEST_BUCKET,
                         version.Key,
                         'null',
                         undefined,
-                        (err) => {
-                            cb(err);
-                        },
+                        cb,
                     );
-                }, (err) => {
-                    next(err);
-                });
+                }, next);
             },
-        ], (err) => {
-            done(err);
-        });
+        ], done);
     });
 });
 
diff --git a/tests/zenko_tests/node_tests/backbeat/tests/lifecycle/transition.js b/tests/zenko_tests/node_tests/backbeat/tests/lifecycle/transition.js
@@ -1,5 +1,4 @@
 const assert = require('assert');
-const console = require('console');
 const uuid = require('uuid/v4');
 const { series } = require('async');
 
diff --git a/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/nonVersionedBucket.js b/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/nonVersionedBucket.js
@@ -24,15 +24,15 @@ const BUCKET_NAME = {
 const ownerInfo = {};
 
 async function putObjects(bucketName) {
-    for (let n = 0; n < 10; n++) {
-        await s3.send(new PutObjectCommand({ Bucket: bucketName, Key: `key-${n}` }));
-    }
+    await Promise.all(Array.from({ length: 10 }, (_, n) => s3.send(new PutObjectCommand(
+        { Bucket: bucketName, Key: `key-${n}` },
+    ))));
 }
 
 async function emptyBucket(bucketName) {
-    for (let n = 0; n < 10; n++) {
-        await s3.send(new DeleteObjectCommand({ Bucket: bucketName, Key: `key-${n}` }));
-    }
+    await Promise.all(Array.from({ length: 10 }, (_, n) => s3.send(new DeleteObjectCommand(
+        { Bucket: bucketName, Key: `key-${n}` },
+    ))));
 }
 
 function expectedKeyList(startKey, endKey) {
diff --git a/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versionedBucket.js b/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versionedBucket.js
@@ -37,19 +37,21 @@ const ownerInfo = {};
 
 async function putObjectVersions(objName, vFormat) {
     for (let i = 0; i < 3; i++) {
-        const res = await s3.send(new PutObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: objName }));
-        versionIds[vFormat][objName].push(res.VersionId);
+        // eslint-disable-next-line no-await-in-loop
+        const result = await s3.send(new PutObjectCommand(
+            { Bucket: BUCKET_NAME[vFormat], Key: objName },
+        ));
+        versionIds[vFormat][objName].push(result.VersionId);
     }
 }
 
 async function deleteObjectVersions(objName, vFormat) {
-    for (let i = 0; i < 3; i++) {
-        await s3.send(new DeleteObjectCommand({
-            Bucket: BUCKET_NAME[vFormat],
-            Key: objName,
-            VersionId: versionIds[vFormat][objName][i],
-        }));
-    }
+    const promises = Array.from({ length: 3 }, (_, i) => s3.send(new DeleteObjectCommand({
+        Bucket: BUCKET_NAME[vFormat],
+        Key: objName,
+        VersionId: versionIds[vFormat][objName][i],
+    })));
+    await Promise.all(promises);
 }
 
 describe('Cloudserver : keyFormatVersion : versioned bucket', () => {
diff --git a/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versioningSuspended.js b/tests/zenko_tests/node_tests/cloudserver/keyFormatVersion/tests/versioningSuspended.js
@@ -37,19 +37,21 @@ const ownerInfo = {};
 
 async function putObjectVersions(objName, vFormat) {
     for (let i = 0; i < 3; i++) {
-        const res = await s3.send(new PutObjectCommand({ Bucket: BUCKET_NAME[vFormat], Key: objName }));
-        versionIds[vFormat][objName].push(res.VersionId);
+        // eslint-disable-next-line no-await-in-loop
+        const result = await s3.send(new PutObjectCommand(
+            { Bucket: BUCKET_NAME[vFormat], Key: objName },
+        ));
+        versionIds[vFormat][objName].push(result.VersionId);
     }
 }
 
 async function deleteObjectVersions(objName, vFormat) {
-    for (let i = 0; i < 3; i++) {
-        await s3.send(new DeleteObjectCommand({
-            Bucket: BUCKET_NAME[vFormat],
-            Key: objName,
-            VersionId: versionIds[vFormat][objName][i],
-        }));
-    }
+    const promises = Array.from({ length: 3 }, (_, i) => s3.send(new DeleteObjectCommand({
+        Bucket: BUCKET_NAME[vFormat],
+        Key: objName,
+        VersionId: versionIds[vFormat][objName][i],
+    })));
+    await Promise.all(promises);
 }
 
 describe('Cloudserver : keyFormatVersion : versioning suspended bucket', () => {
diff --git a/tests/zenko_tests/node_tests/yarn.lock b/tests/zenko_tests/node_tests/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`const assert = require('assert');`
`2`		`-const console = require('console');`
`3`	`2`	`const uuid = require('uuid/v4');`
`4`	`3`	`const { series } = require('async');`
`5`	`4`