Skip to content

Commit 0ebd8f5

Browse files
SylvainSenechalSylvainSenechal
committed
addressed comment before squashing
1 parent 2c88dd1 commit 0ebd8f5

File tree

6 files changed

+20
-37
lines changed

6 files changed

+20
-37
lines changed

‎tests/functional/aws-node-sdk/test/bucket/getLocation.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ describeSkipAWS('GET bucket location ', () => {
7575
after(() => {
7676
process.stdout.write('Deleting bucket\n');
7777
return bucketUtil.deleteOne(bucketName)
78-
.catch(err => {
79-
process.stdout.write(`Error in after: ${err}\n`);
80-
throw err;
81-
});
78+
.catch(err => {
79+
process.stdout.write(`Error in after: ${err}\n`);
80+
throw err;
81+
});
8282
});
8383

8484
it('should return request endpoint as location', async () => {

‎tests/functional/aws-node-sdk/test/bucket/putBucketLifecycle.js‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
506506
try {
507507
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
508508
} catch (err) {
509-
// Feature not implemented in CloudServer - skip test
510509
if (err.name === 'NotImplemented') {
511510
this.skip();
512511
}
@@ -527,7 +526,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
527526
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
528527
throw new Error('Expected error');
529528
} catch (err) {
530-
// Accept either NotImplemented or InvalidRequest depending on implementation status
531529
if (err.name === 'NotImplemented') {
532530
// CloudServer returns NotImplemented for NoncurrentVersionTransitions
533531
assert(err.name === 'NotImplemented');
@@ -551,7 +549,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
551549
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
552550
throw new Error('Expected MalformedXML error');
553551
} catch (err) {
554-
// Accept either NotImplemented or MalformedXML depending on implementation status
555552
assert(err.name === 'MalformedXML' || err.name === 'NotImplemented',
556553
`Expected MalformedXML or NotImplemented, got ${err.name}`);
557554
}
@@ -567,7 +564,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
567564
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
568565
throw new Error('Expected MalformedXML error');
569566
} catch (err) {
570-
// Accept either NotImplemented or MalformedXML depending on implementation status
571567
assert(err.name === 'MalformedXML' || err.name === 'NotImplemented',
572568
`Expected MalformedXML or NotImplemented, got ${err.name}`);
573569
}
@@ -583,7 +579,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
583579
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
584580
throw new Error('Expected error');
585581
} catch (err) {
586-
// Accept either NotImplemented or InvalidArgument depending on implementation status
587582
assert(err.name === 'InvalidArgument' || err.name === 'NotImplemented',
588583
`Expected InvalidArgument or NotImplemented, got ${err.name}`);
589584
if (err.name === 'InvalidArgument') {
@@ -603,7 +598,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
603598
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
604599
throw new Error('Expected error');
605600
} catch (err) {
606-
// Accept either NotImplemented or MalformedXML depending on implementation status
607601
assert(err.name === 'MalformedXML' || err.name === 'NotImplemented',
608602
`Expected MalformedXML or NotImplemented, got ${err.name}`);
609603
}
@@ -618,7 +612,6 @@ describe('aws-sdk test put bucket lifecycle', () => {
618612
await s3.send(new PutBucketLifecycleConfigurationCommand(params));
619613
throw new Error('Expected error');
620614
} catch (err) {
621-
// Accept either NotImplemented or MalformedXML depending on implementation status
622615
assert(err.name === 'MalformedXML' || err.name === 'NotImplemented',
623616
`Expected MalformedXML or NotImplemented, got ${err.name}`);
624617
}

‎tests/functional/aws-node-sdk/test/multipleBackend/acl/aclAwsVersioning.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,7 @@ function getObjectAndAssertAcl(s3, params, cb) {
143143
.then(data => {
144144
// eslint-disable-next-line no-unused-vars
145145
const {$metadata, ...aclData} = data;
146-
// eslint-disable-next-line no-param-reassign
147-
data = aclData;
148-
assert.deepEqual(data, expectedResult);
146+
assert.deepEqual(aclData, expectedResult);
149147
cb();
150148
})
151149
.catch(cb);

‎tests/functional/aws-node-sdk/test/multipleBackend/objectPutCopyPart/objectPutCopyPartGcp.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -267,21 +267,21 @@ describeSkipIfNotMultipleOrCeph('Put Copy Part to GCP', function describeFn() {
267267
UploadId: this.currentTest.uploadIdAWS,
268268
};
269269
async.waterfall([
270-
next => {
271-
s3.send(new AbortMultipartUploadCommand(paramsGcp))
272-
.then(() => next())
273-
.catch(next);
274-
},
275-
next => {
276-
s3.send(new AbortMultipartUploadCommand(paramsMem))
277-
.then(() => next())
278-
.catch(next);
279-
},
280-
next => {
281-
s3.send(new AbortMultipartUploadCommand(paramsAWS))
282-
.then(() => next())
283-
.catch(next);
284-
},
270+
next => {
271+
s3.send(new AbortMultipartUploadCommand(paramsGcp))
272+
.then(() => next())
273+
.catch(next);
274+
},
275+
next => {
276+
s3.send(new AbortMultipartUploadCommand(paramsMem))
277+
.then(() => next())
278+
.catch(next);
279+
},
280+
next => {
281+
s3.send(new AbortMultipartUploadCommand(paramsAWS))
282+
.then(() => next())
283+
.catch(next);
284+
},
285285
], done);
286286
});
287287

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ utils.putToAwsBackend = (s3, bucket, key, body, callback) => {
276276
};
277277

278278
utils.enableVersioning = (s3, bucket, callback) => {
279-
// Support both callback and promise patterns
280279
const promise = s3.send(new PutBucketVersioningCommand({
281280
Bucket: bucket,
282281
VersioningConfiguration: versioningEnabled
@@ -289,7 +288,6 @@ utils.enableVersioning = (s3, bucket, callback) => {
289288
};
290289

291290
utils.suspendVersioning = (s3, bucket, callback) => {
292-
// Support both callback and promise patterns
293291
const promise = s3.send(new PutBucketVersioningCommand({
294292
Bucket: bucket,
295293
VersioningConfiguration: versioningSuspended
@@ -305,7 +303,6 @@ utils.mapToAwsPuts = async (s3, bucket, key, dataArray, callback) => {
305303
try {
306304
const results = [];
307305
for (const data of dataArray) {
308-
// Don't pass callback to putToAwsBackend - we need the version ID from the promise
309306
const result = await utils.putToAwsBackend(s3, bucket, key, data);
310307
const versionId = result.VersionId;
311308
results.push(versionId);

‎tests/functional/raw-node/test/GCP/object/completeMpu.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@ describe('GCP: Complete MPU', function testSuite() {
193193
MultipartUpload: { Parts: parts },
194194
};
195195
gcpClient.completeMultipartUpload(params, (err, res) => {
196-
// eslint-disable-next-line no-console
197-
console.log('completeMultipartUpload response:', res);
198-
// eslint-disable-next-line no-console
199-
console.log('completeMultipartUpload error:', err);
200196
assert.equal(err, null,
201197
`Expected success, but got error ${err}`);
202198
assert.strictEqual(res.ETag, `"${smallMD5}"`);
@@ -218,7 +214,6 @@ describe('GCP: Complete MPU', function testSuite() {
218214

219215
it('should successfully complete MPU',
220216
function testFn(done) {
221-
this.timeout(1200000);
222217
this.retries(1);
223218

224219
const parts = GcpUtils.createMpuList({

0 commit comments

Comments
 (0)