fixup post reviews

benzekrimaha · benzekrimaha · commit b2b0224d48a2 · 2026-03-12T17:31:32.000+01:00
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAwsVersioning.js b/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAwsVersioning.js
@@ -205,9 +205,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
                     key, versionId: 'null', resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                            versionId: awsVerId, errorCode: wanted }, next);
+                            versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -242,9 +241,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
                     key, versionId: 'null', resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                        versionId: awsVerId, errorCode: wanted }, next);
+                        versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -262,9 +260,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
                     key, versionId: s3VerId, resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                        versionId: awsVerId, errorCode: wanted }, next);
+                        versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -524,9 +521,8 @@ describeSkipIfNotMultiple('AWS backend delete object w. versioning: ' +
                 (awsVid, next) => _getAssertDeleted(s3, { key,
                     errorCode: 'NoSuchKey' }, () => next(null, awsVid)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                            versionId: awsVerId, errorCode: wanted }, next);
+                            versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -681,9 +677,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
                     key, versionId: 'null', resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                        versionId: awsVerId, errorCode: wanted }, next);
+                        versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -699,9 +694,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
                     key, versionId: 'null', resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                        versionId: awsVerId, errorCode: wanted }, next);
+                        versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
@@ -719,9 +713,8 @@ describeSkipIfNotMultiple('AWS backend delete multiple objects w. versioning: '
                     key, versionId: s3VerId, resultType: deleteVersion },
                     err => next(err, awsVerId)),
                 (awsVerId, next) => {
-                    const wanted = 'NoSuchVersion';
                     _awsGetAssertDeleted({ key,
-                        versionId: awsVerId, errorCode: wanted }, next);
+                        versionId: awsVerId, errorCode: 'NoSuchVersion' }, next);
                 },
             ], done);
         });
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAzure.js b/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteAzure.js
@@ -15,6 +15,7 @@ const {
     getAzureKeys,
     azureLocation,
     azureLocationMismatch,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 
 const keyObject = 'deleteazure';
@@ -29,7 +30,7 @@ const nonExistingId = process.env.AWS_ON_AIR ?
     'MhhyTHhmZ4cxSi4Y9SMe5P7UJAz7HLJ9' :
     '3939393939393939393936493939393939393939756e6437';
 
-describe.skip('Multiple backend delete object from Azure',
+describeSkipIfNotMultiple('Multiple backend delete object from Azure',
 function testSuite() {
     this.timeout(250000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/delete/deleteGcp.js
@@ -9,6 +9,7 @@ const {
     gcpLocation,
     gcpLocationMismatch,
     genUniqID,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 
 const bucket = `deletegcp${genUniqID()}`;
@@ -19,7 +20,7 @@ const mismatchObject = `mismatchObject-${genUniqID()}`;
 const body = Buffer.from('I am a body', 'utf8');
 const bigBody = Buffer.alloc(10485760);
 
-describe.skip('Multiple backend delete',
+describeSkipIfNotMultiple('Multiple backend delete',
 function testSuite() {
     this.timeout(120000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/get/getAzure.js b/tests/functional/aws-node-sdk/test/multipleBackend/get/getAzure.js
@@ -12,6 +12,7 @@ const {
     getAzureContainerName,
     getAzureKeys,
     azureLocation,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 
 const azureClient = getAzureClient();
@@ -23,7 +24,7 @@ const normalBody = Buffer.from('I am a body', 'utf8');
 
 const azureTimeout = 10000;
 
-describe.skip('Multiple backend get object from Azure',
+describeSkipIfNotMultiple('Multiple backend get object from Azure',
 function testSuite() {
     this.timeout(30000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/get/getGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/get/getGcp.js
@@ -8,6 +8,7 @@ const {
     gcpLocation,
     gcpLocationMismatch,
     genUniqID,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 
 const bucket = `getgcp${genUniqID()}`;
@@ -52,7 +53,7 @@ describe('Multiple backend get object', function testSuite() {
             });
         });
 
-        describe.skip('with objects in GCP', () => {
+        describeSkipIfNotMultiple('with objects in GCP', () => {
             before(() => {
                 process.stdout.write('Putting object to GCP\n');
                 return s3.send(new PutObjectCommand({ Bucket: bucket, Key: gcpObject,
@@ -127,7 +128,7 @@ describe('Multiple backend get object', function testSuite() {
             });
         });
 
-        describe.skip('with bucketMatch set to false', () => {
+        describeSkipIfNotMultiple('with bucketMatch set to false', () => {
             beforeEach(done => {
                 s3.send(new PutObjectCommand({ Bucket: bucket, Key: mismatchObject, Body: body,
                 Metadata: { 'scal-location-constraint': gcpLocationMismatch } })).then(() => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUAzure.js b/tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUAzure.js
@@ -10,15 +10,15 @@ const {
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { azureLocation, getAzureContainerName,
-    genUniqID } = require('../utils');
+    genUniqID, describeSkipIfNotMultiple } = require('../utils');
 
 const keyName = `somekey-${genUniqID()}`;
 
 const azureContainerName = getAzureContainerName(azureLocation);
 let s3;
 let bucketUtil;
 
-describe.skip('Initiate MPU to AZURE', () => {
+describeSkipIfNotMultiple('Initiate MPU to AZURE', () => {
     withV4(sigCfg => {
         beforeEach(() => {
             bucketUtil = new BucketUtility('default', sigCfg);
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/initMPU/initMPUGcp.js
@@ -11,7 +11,7 @@ const {
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { gcpClient, gcpBucketMPU, gcpLocation,
-    genUniqID } = require('../utils');
+    genUniqID, describeSkipIfNotMultiple } = require('../utils');
 const { createMpuKey } = arsenal.storage.data.external.GcpUtils;
 
 const bucket = `initmpugcp${genUniqID()}`;
@@ -20,7 +20,7 @@ const keyName = `somekey-${genUniqID()}`;
 let s3;
 let bucketUtil;
 
-describe.skip('Initiate MPU to GCP', () => {
+describeSkipIfNotMultiple('Initiate MPU to GCP', () => {
     withV4(sigCfg => {
         beforeEach(() => {
             bucketUtil = new BucketUtility('default', sigCfg);
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js b/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js
@@ -8,7 +8,7 @@ const { CreateBucketCommand,
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { azureLocation, getAzureContainerName,
-    genUniqID } = require('../utils');
+    genUniqID, describeSkipIfNotMultiple } = require('../utils');
 
 const azureContainerName = getAzureContainerName(azureLocation);
 const firstPartSize = 10;
@@ -19,7 +19,7 @@ const bodySecondPart = Buffer.alloc(secondPartSize);
 let bucketUtil;
 let s3;
 
-describe.skip('List parts of MPU on Azure data backend',
+describeSkipIfNotMultiple('List parts of MPU on Azure data backend',
 () => {
     withV4(sigCfg => {
         beforeEach(function beforeEachFn() {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/listParts/listPartsGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/listParts/listPartsGcp.js
@@ -6,7 +6,7 @@ const { CreateBucketCommand,
     ListPartsCommand } = require('@aws-sdk/client-s3');
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
-const { gcpLocation, genUniqID }
+const { gcpLocation, genUniqID, describeSkipIfNotMultiple }
     = require('../utils');
 
 const bucket = `listpartsgcp${genUniqID()}`;
@@ -18,7 +18,7 @@ const bodySecondPart = Buffer.alloc(secondPartSize);
 let bucketUtil;
 let s3;
 
-describe.skip('List parts of MPU on GCP data backend', () => {
+describeSkipIfNotMultiple('List parts of MPU on GCP data backend', () => {
     withV4(sigCfg => {
         beforeEach(function beforeEachFn() {
             this.currentTest.key = `somekey-${genUniqID()}`;
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuAbort/abortMPUGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuAbort/abortMPUGcp.js
@@ -12,7 +12,7 @@ const {
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { gcpClient, gcpBucket, gcpBucketMPU,
-    gcpLocation, uniqName, genUniqID } = require('../utils');
+    gcpLocation, uniqName, genUniqID, describeSkipIfNotMultiple } = require('../utils');
 
 const keyObject = 'abortgcp';
 const bucket = `abortmpugcp${genUniqID()}`;
@@ -38,7 +38,7 @@ function checkMPUList(bucket, key, uploadId, cb) {
     });
 }
 
-describe.skip('Abort MPU on GCP data backend', function
+describeSkipIfNotMultiple('Abort MPU on GCP data backend', function
 descrbeFn() {
     this.timeout(180000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuAbort/azureAbortMPU.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuAbort/azureAbortMPU.js
@@ -13,7 +13,8 @@ const { s3middleware } = require('arsenal');
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { uniqName, getAzureClient,
-    getAzureContainerName, convertMD5, azureLocation } = require('../utils');
+    getAzureContainerName, convertMD5, azureLocation,
+    describeSkipIfNotMultiple } = require('../utils');
 const azureMpuUtils = s3middleware.azureHelper.mpuUtils;
 const maxSubPartSize = azureMpuUtils.maxSubPartSize;
 
@@ -40,7 +41,7 @@ function azureCheck(container, key, expected, cb) {
     });
 }
 
-describe.skip('Abort MPU on Azure data backend', function
+describeSkipIfNotMultiple('Abort MPU on Azure data backend', function
 describeF() {
     this.timeout(50000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuComplete/azureCompleteMPU.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuComplete/azureCompleteMPU.js
@@ -19,6 +19,7 @@ const {
     getAzureClient,
     getAzureContainerName,
     genUniqID,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 
 const azureMpuUtils = s3middleware.azureHelper.mpuUtils;
@@ -113,7 +114,7 @@ function mpuSetup(key, location, cb) {
     });
 }
 
-describe.skip('Complete MPU API for Azure data backend',
+describeSkipIfNotMultiple('Complete MPU API for Azure data backend',
 function testSuite() {
     this.timeout(150000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuComplete/completeMPUGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuComplete/completeMPUGcp.js
@@ -13,7 +13,7 @@ const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { fileLocation, awsS3, awsLocation,
     awsBucket, gcpClient, gcpBucket, gcpLocation, gcpLocationMismatch,
-    genUniqID } = require('../utils');
+    genUniqID, describeSkipIfNotMultiple } = require('../utils');
 
 const bucket = `completempugcp${genUniqID()}`;
 const smallBody = Buffer.from('I am a body', 'utf8');
@@ -103,7 +103,7 @@ function mpuSetup(key, location, cb) {
     });
 }
 
-describe.skip('Complete MPU API for GCP data backend',
+describeSkipIfNotMultiple('Complete MPU API for GCP data backend',
 function testSuite() {
     this.timeout(150000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuParts/azurePutPart.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuParts/azurePutPart.js
@@ -15,7 +15,8 @@ const { s3middleware } = require('arsenal');
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { expectedETag, uniqName, getAzureClient,
-    getAzureContainerName, convertMD5, azureLocation, azureLocationMismatch }
+    getAzureContainerName, convertMD5, azureLocation, azureLocationMismatch,
+    describeSkipIfNotMultiple }
     = require('../utils');
 const azureMpuUtils = s3middleware.azureHelper.mpuUtils;
 const maxSubPartSize = azureMpuUtils.maxSubPartSize;
@@ -62,7 +63,7 @@ function azureCheck(key, cb) {
         .catch(err => cb(err));
 }
 
-describe.skip('MultipleBackend put part to AZURE', function
+describeSkipIfNotMultiple('MultipleBackend put part to AZURE', function
 describeF() {
     this.timeout(80000);
     withV4(sigCfg => {
@@ -382,7 +383,7 @@ describeF() {
     });
 });
 
-describe.skip('MultipleBackend put part to AZURE ' +
+describeSkipIfNotMultiple('MultipleBackend put part to AZURE ' +
 'location with bucketMatch sets to false', function
 describeF() {
     this.timeout(80000);
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/mpuParts/putPartGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/mpuParts/putPartGcp.js
@@ -14,7 +14,8 @@ const arsenal = require('arsenal');
 const withV4 = require('../../support/withV4');
 const BucketUtility = require('../../../lib/utility/bucket-util');
 const { gcpClient, gcpBucket, gcpBucketMPU,
-    gcpLocation, gcpLocationMismatch, uniqName, genUniqID }
+    gcpLocation, gcpLocationMismatch, uniqName, genUniqID,
+    describeSkipIfNotMultiple }
     = require('../utils');
 const { createMpuKey } = arsenal.storage.data.external.GcpUtils;
 
@@ -46,7 +47,7 @@ function checkMPUResult(bucket, key, uploadId, objCount, expected, cb) {
     });
 }
 
-describe.skip('MultipleBacked put part to GCP', function
+describeSkipIfNotMultiple('MultipleBacked put part to GCP', function
 describeFn() {
     this.timeout(180000);
     withV4(sigCfg => {
@@ -290,7 +291,7 @@ describeFn() {
     });
 });
 
-describe.skip('MultipleBackend put part to GCP location ' +
+describeSkipIfNotMultiple('MultipleBackend put part to GCP location ' +
 'with bucketMatch sets to false', function
 describeF() {
     this.timeout(80000);
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/objectCopy/azureObjectCopy.js b/tests/functional/aws-node-sdk/test/multipleBackend/objectCopy/azureObjectCopy.js
@@ -20,6 +20,7 @@ const {
     azureLocation2,
     azureLocationMismatch,
     genUniqID,
+    describeSkipIfNotMultiple,
 } = require('../utils');
 const { createEncryptedBucketPromise } =
     require('../../../lib/utility/createEncryptedBucket');
@@ -147,7 +148,7 @@ destBucket, destLoc, azureKey, mdDirective, objSize, callback) {
     });
 }
 
-describe.skip('MultipleBackend object copy: Azure',
+describeSkipIfNotMultiple('MultipleBackend object copy: Azure',
 function testSuite() {
     this.timeout(250000);
     withV4(sigCfg => {
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/objectPutCopyPart/objectPutCopyPartAzure.js b/tests/functional/aws-node-sdk/test/multipleBackend/objectPutCopyPart/objectPutCopyPartAzure.js
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/objectPutCopyPart/objectPutCopyPartGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/objectPutCopyPart/objectPutCopyPartGcp.js
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/put/putAzure.js b/tests/functional/aws-node-sdk/test/multipleBackend/put/putAzure.js
diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/put/putGcp.js b/tests/functional/aws-node-sdk/test/multipleBackend/put/putGcp.js
