Skip to content

Commit c235b46

Browse files
CLDSRV-717: Move utils out of multi backend
The awslocation in multiBackend breaks S3C Integration
1 parent d95acb7 commit c235b46

4 files changed

Lines changed: 30 additions & 11 deletions

File tree

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const { config } = require('../../../../../lib/Config');
2+
3+
const isCEPH = process.env.CI_CEPH !== undefined;
4+
const itSkipCeph = isCEPH ? it.skip : it;
5+
const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip
6+
let describeSkipIfNotMultiple = describe.skip;
7+
let describeSkipIfNotMultipleOrCeph = describe.skip;
8+
9+
if (config.backends.data === 'multiple') {
10+
describeSkipIfNotMultiple = describe;
11+
describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip
12+
}
13+
14+
module.exports = {
15+
isCEPH,
16+
itSkipCeph,
17+
describeSkipIfCeph,
18+
describeSkipIfNotMultiple,
19+
describeSkipIfNotMultipleOrCeph,
20+
};

tests/functional/aws-node-sdk/test/multipleBackend/utils.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ const { getRealAwsConfig } = require('../support/awsConfig');
1414
const { config } = require('../../../../../lib/Config');
1515
const authdata = require('../../../../../conf/authdata.json');
1616

17+
const {
18+
describeSkipIfNotMultiple,
19+
describeSkipIfNotMultipleOrCeph,
20+
describeSkipIfCeph,
21+
isCEPH,
22+
itSkipCeph,
23+
} = require('../../lib/utility/test-utils');
24+
1725
const memLocation = 'scality-internal-mem';
1826
const fileLocation = 'scality-internal-file';
1927
const awsLocation = 'awsbackend';
@@ -31,22 +39,14 @@ const versioningEnabled = { Status: 'Enabled' };
3139
const versioningSuspended = { Status: 'Suspended' };
3240
const awsFirstTimeout = 10000;
3341
const awsSecondTimeout = 30000;
34-
let describeSkipIfNotMultiple = describe.skip;
35-
let describeSkipIfNotMultipleOrCeph = describe.skip;
3642
let awsS3;
3743
let awsBucket;
3844

3945
let gcpClient;
4046
let gcpBucket;
4147
let gcpBucketMPU;
4248

43-
const isCEPH = process.env.CI_CEPH !== undefined;
44-
const itSkipCeph = isCEPH ? it.skip : it;
45-
const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip
46-
4749
if (config.backends.data === 'multiple') {
48-
describeSkipIfNotMultiple = describe;
49-
describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip
5050
const awsConfig = getRealAwsConfig(awsLocation);
5151
awsS3 = new AWS.S3(awsConfig);
5252
awsBucket = config.locationConstraints[awsLocation].details.bucketName;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const assert = require('assert');
77
const withV4 = require('../support/withV4');
88
const BucketUtility = require('../../lib/utility/bucket-util');
99

10-
const { describeSkipIfCeph } = require('../multipleBackend/utils');
10+
const { describeSkipIfCeph } = require('../../lib/utility/test-utils');
1111

1212
const bucket = 'bucket-for-range-test';
1313
const key = 'key-for-range-test';

tests/multipleBackend/routes/routeBackbeat.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ const { makeid } = require('../../unit/helpers');
1010
const { makeRequest, makeBackbeatRequest } = require('../../functional/raw-node/utils/makeRequest');
1111
const BucketUtility =
1212
require('../../functional/aws-node-sdk/lib/utility/bucket-util');
13+
const { describeSkipIfNotMultipleOrCeph, itSkipCeph } = require('../../functional/aws-node-sdk/lib/utility/test-utils');
1314
const {
14-
describeSkipIfNotMultipleOrCeph,
15-
itSkipCeph,
1615
awsLocation,
1716
azureLocation,
1817
getAzureContainerName,

0 commit comments

Comments
 (0)