Skip to content

Commit 2f8030d

Browse files
BourgoisMickaelBourgoisMickael
committed
CLDSRV-623: Use errorInstances in tests
(cherry picked from commit 94d0ffe)
1 parent c9044b1 commit 2f8030d

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require('assert');
22
const AWS = require('aws-sdk');
3-
const { errors } = require('arsenal');
3+
const { errorInstances } = require('arsenal');
44

55
const withV4 = require('../support/withV4');
66
const BucketUtility = require('../../lib/utility/bucket-util');
@@ -41,7 +41,7 @@ withV4(sigCfg => {
4141
function cbWithError(done) {
4242
return err => {
4343
assert.notStrictEqual(err, null);
44-
assert.strictEqual(err.statusCode, errors.AccessDenied.code);
44+
assert.strictEqual(err.statusCode, errorInstances.AccessDenied.code);
4545
done();
4646
};
4747
}
@@ -181,7 +181,7 @@ withV4(sigCfg => {
181181
assert.notStrictEqual(err, null);
182182
assert.strictEqual(
183183
err.statusCode,
184-
errors.AccessDenied.code
184+
errorInstances.AccessDenied.code
185185
);
186186
}
187187
done();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require('assert');
22
const AWS = require('aws-sdk');
3-
const { errors } = require('arsenal');
3+
const { errorInstances } = require('arsenal');
44

55
const withV4 = require('../support/withV4');
66
const BucketUtility = require('../../lib/utility/bucket-util');
@@ -32,7 +32,7 @@ withV4(sigCfg => {
3232

3333
function cbWithError(done) {
3434
return err => {
35-
assert.strictEqual(err.statusCode, errors.AccessDenied.code);
35+
assert.strictEqual(err.statusCode, errorInstances.AccessDenied.code);
3636
done();
3737
};
3838
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const assert = require('assert');
22
const { S3 } = require('aws-sdk');
33
const { series } = require('async');
4-
const { errors } = require('arsenal');
4+
const { errorInstances } = require('arsenal');
55

66
const getConfig = require('../support/config');
77
const BucketUtility = require('../../lib/utility/bucket-util');
@@ -81,7 +81,7 @@ describe('aws-node-sdk test deleteBucketReplication', () => {
8181
}),
8282
next => deleteReplicationAndCheckResponse(bucket, next),
8383
next => s3.getBucketReplication({ Bucket: bucket }, err => {
84-
assert(errors.ReplicationConfigurationNotFoundError.is[err.code]);
84+
assert(errorInstances.ReplicationConfigurationNotFoundError.is[err.code]);
8585
return next();
8686
}),
8787
], done));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const assert = require('assert');
22
const { S3 } = require('aws-sdk');
33
const { series } = require('async');
4-
const { errors } = require('arsenal');
4+
const { errorInstances } = require('arsenal');
55

66
const getConfig = require('../support/config');
77
const BucketUtility = require('../../lib/utility/bucket-util');
@@ -45,7 +45,7 @@ describe('aws-node-sdk test getBucketReplication', () => {
4545
it("should return 'ReplicationConfigurationNotFoundError' if bucket does " +
4646
'not have a replication configuration', done =>
4747
s3.getBucketReplication({ Bucket: bucket }, err => {
48-
assert(errors.ReplicationConfigurationNotFoundError.is[err.code]);
48+
assert(errorInstances.ReplicationConfigurationNotFoundError.is[err.code]);
4949
return done();
5050
}));
5151

‎tests/functional/aws-node-sdk/test/object/objectHead.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require('assert');
22
const async = require('async');
3-
const { errors } = require('arsenal');
3+
const { errorInstances } = require('arsenal');
44
const moment = require('moment');
55
const Promise = require('bluebird');
66

@@ -127,7 +127,7 @@ describe('HEAD object, conditions', () => {
127127
it('If-Match: returns PreconditionFailed when ETag does not match',
128128
done => {
129129
requestHead({ IfMatch: 'non-matching ETag' }, err => {
130-
checkError(err, errors.PreconditionFailed.code);
130+
checkError(err, errorInstances.PreconditionFailed.code);
131131
done();
132132
});
133133
});
@@ -244,7 +244,7 @@ describe('HEAD object, conditions', () => {
244244
'lastModified date is lesser',
245245
done => {
246246
requestHead({ IfUnmodifiedSince: dateFromNow(-1) }, err => {
247-
checkError(err, errors.PreconditionFailed.code);
247+
checkError(err, errorInstances.PreconditionFailed.code);
248248
done();
249249
});
250250
});
@@ -276,7 +276,7 @@ describe('HEAD object, conditions', () => {
276276
IfMatch: 'non-matching',
277277
IfUnmodifiedSince: dateFromNow(-1),
278278
}, err => {
279-
checkError(err, errors.PreconditionFailed.code);
279+
checkError(err, errorInstances.PreconditionFailed.code);
280280
done();
281281
});
282282
});
@@ -286,7 +286,7 @@ describe('HEAD object, conditions', () => {
286286
IfMatch: 'non-matching',
287287
IfUnmodifiedSince: dateFromNow(1),
288288
}, err => {
289-
checkError(err, errors.PreconditionFailed.code);
289+
checkError(err, errorInstances.PreconditionFailed.code);
290290
done();
291291
});
292292
});
@@ -318,7 +318,7 @@ describe('HEAD object, conditions', () => {
318318
IfMatch: 'non-matching',
319319
IfModifiedSince: dateFromNow(1),
320320
}, err => {
321-
checkError(err, errors.PreconditionFailed.code);
321+
checkError(err, errorInstances.PreconditionFailed.code);
322322
done();
323323
});
324324
});
@@ -328,7 +328,7 @@ describe('HEAD object, conditions', () => {
328328
IfMatch: 'non-matching',
329329
IfModifiedSince: dateFromNow(-1),
330330
}, err => {
331-
checkError(err, errors.PreconditionFailed.code);
331+
checkError(err, errorInstances.PreconditionFailed.code);
332332
done();
333333
});
334334
});
@@ -392,7 +392,7 @@ describe('HEAD object, conditions', () => {
392392
IfNoneMatch: 'non-matching',
393393
IfUnmodifiedSince: dateFromNow(-1),
394394
}, err => {
395-
checkError(err, errors.PreconditionFailed.code);
395+
checkError(err, errorInstances.PreconditionFailed.code);
396396
done();
397397
});
398398
});
@@ -412,7 +412,7 @@ describe('HEAD object, conditions', () => {
412412
IfNoneMatch: etagTrim,
413413
IfUnmodifiedSince: dateFromNow(-1),
414414
}, err => {
415-
checkError(err, errors.PreconditionFailed.code);
415+
checkError(err, errorInstances.PreconditionFailed.code);
416416
done();
417417
});
418418
});

‎tests/multipleBackend/multipartUpload.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const assert = require('assert');
22
const async = require('async');
33
const AWS = require('aws-sdk');
44
const { parseString } = require('xml2js');
5-
const { errors, models } = require('arsenal');
5+
const { errors, errorInstances, models } = require('arsenal');
66

77
const BucketInfo = models.BucketInfo;
88
const { getRealAwsConfig } =
@@ -466,7 +466,7 @@ describe('Multipart Upload API with AWS Backend', function mpuTestSuite() {
466466
abortMPU(uploadId, getAwsParams(objectKey), () => {
467467
const listParams = getListParams(objectKey, uploadId);
468468
listParts(authInfo, listParams, log, err => {
469-
assert.deepStrictEqual(err, errors.ServiceUnavailable
469+
assert.deepStrictEqual(err, errorInstances.ServiceUnavailable
470470
.customizeDescription('Error returned from AWS: ' +
471471
'The specified upload does not exist. The upload ID ' +
472472
'may be invalid, or the upload may have been aborted ' +

‎tests/unit/api/apiUtils/objectLockHelpers.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const assert = require('assert');
22
const moment = require('moment');
3-
const { errors } = require('arsenal');
3+
const { errorInstances } = require('arsenal');
44
const BucketInfo = require('arsenal').models.BucketInfo;
55
const { DummyRequestLogger } = require('../../helpers');
66
const {
@@ -35,7 +35,7 @@ describe('objectLockHelpers: validateHeaders', () => {
3535
};
3636
const objectLockValidationError
3737
= validateHeaders(objLockDisabledBucketInfo, headers, log);
38-
const expectedError = errors.InvalidRequest.customizeDescription(
38+
const expectedError = errorInstances.InvalidRequest.customizeDescription(
3939
'Bucket is missing ObjectLockConfiguration');
4040
assert.strictEqual(objectLockValidationError.is.InvalidRequest, true);
4141
assert.strictEqual(objectLockValidationError.description,
@@ -87,7 +87,7 @@ describe('objectLockHelpers: validateHeaders', () => {
8787
};
8888
const objectLockValidationError
8989
= validateHeaders(bucketInfo, headers, log);
90-
const expectedError = errors.InvalidArgument.customizeDescription(
90+
const expectedError = errorInstances.InvalidArgument.customizeDescription(
9191
'x-amz-object-lock-retain-until-date and x-amz-object-lock-mode ' +
9292
'must both be supplied');
9393
assert.strictEqual(objectLockValidationError.is.InvalidArgument, true);
@@ -101,7 +101,7 @@ describe('objectLockHelpers: validateHeaders', () => {
101101
};
102102
const objectLockValidationError
103103
= validateHeaders(bucketInfo, headers, log);
104-
const expectedError = errors.InvalidArgument.customizeDescription(
104+
const expectedError = errorInstances.InvalidArgument.customizeDescription(
105105
'x-amz-object-lock-retain-until-date and x-amz-object-lock-mode ' +
106106
'must both be supplied');
107107
assert.strictEqual(objectLockValidationError.is.InvalidArgument, true);
@@ -114,7 +114,7 @@ describe('objectLockHelpers: validateHeaders', () => {
114114
'x-amz-object-lock-retain-until-date': '2005-10-12',
115115
'x-amz-object-lock-mode': 'COMPLIANCE',
116116
};
117-
const expectedError = errors.InvalidArgument.customizeDescription(
117+
const expectedError = errorInstances.InvalidArgument.customizeDescription(
118118
'The retain until date must be in the future!');
119119
const objectLockValidationError
120120
= validateHeaders(bucketInfo, headers, log);
@@ -129,7 +129,7 @@ describe('objectLockHelpers: validateHeaders', () => {
129129
};
130130
const objectLockValidationError
131131
= validateHeaders(bucketInfo, headers, log);
132-
const expectedError = errors.InvalidArgument.customizeDescription(
132+
const expectedError = errorInstances.InvalidArgument.customizeDescription(
133133
'Legal hold status must be one of "ON", "OFF"');
134134
assert.strictEqual(objectLockValidationError.is.InvalidArgument, true);
135135
assert.strictEqual(objectLockValidationError.description,
@@ -143,7 +143,7 @@ describe('objectLockHelpers: validateHeaders', () => {
143143
};
144144
const objectLockValidationError
145145
= validateHeaders(bucketInfo, headers, log);
146-
const expectedError = errors.InvalidArgument.customizeDescription(
146+
const expectedError = errorInstances.InvalidArgument.customizeDescription(
147147
'Unknown wormMode directive');
148148
assert.strictEqual(objectLockValidationError.is.InvalidArgument, true);
149149
assert.strictEqual(objectLockValidationError.description,

‎tests/unit/api/objectHead.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const assert = require('assert');
2-
const { errors } = require('arsenal');
2+
const { errors, errorInstances } = require('arsenal');
33

44
const { bucketPut } = require('../../../lib/api/bucketPut');
55
const { cleanup, DummyRequestLogger, makeAuthInfo } = require('../helpers');
@@ -183,7 +183,7 @@ describe('objectHead API', () => {
183183
},
184184
actionImplicitDenies: false,
185185
};
186-
const customizedInvalidRequestError = errors.InvalidRequest
186+
const customizedInvalidRequestError = errorInstances.InvalidRequest
187187
.customizeDescription('Cannot specify both Range header and ' +
188188
'partNumber query parameter.');
189189

@@ -211,7 +211,7 @@ describe('objectHead API', () => {
211211
},
212212
actionImplicitDenies: false,
213213
};
214-
const customizedInvalidArgumentError = errors.InvalidArgument
214+
const customizedInvalidArgumentError = errorInstances.InvalidArgument
215215
.customizeDescription('Part number must be a number.');
216216

217217
bucketPut(authInfo, testPutBucketRequest, log, () => {

‎tests/unit/api/objectPut.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const assert = require('assert');
22
const async = require('async');
33
const moment = require('moment');
4-
const { errors, s3middleware } = require('arsenal');
4+
const { errors, errorInstances, s3middleware } = require('arsenal');
55
const sinon = require('sinon');
66

77
const { bucketPut } = require('../../../lib/api/bucketPut');
@@ -546,7 +546,7 @@ describe('objectPut API', () => {
546546

547547
bucketPut(authInfo, testPutBucketRequest, log, () => {
548548
objectPut(authInfo, testPutObjectRequest, undefined, log, err => {
549-
assert.deepStrictEqual(err, errors.InvalidRequest
549+
assert.deepStrictEqual(err, errorInstances.InvalidRequest
550550
.customizeDescription(
551551
'Bucket is missing ObjectLockConfiguration'));
552552
done();

‎tests/unit/api/objectPutACL.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const assert = require('assert');
22
const async = require('async');
33

4-
const { errors } = require('arsenal');
4+
const { errors, errorInstances } = require('arsenal');
55
const AuthInfo = require('arsenal').auth.AuthInfo;
66

77
const { bucketPut } = require('../../../lib/api/bucketPut');
@@ -586,7 +586,7 @@ describe('putObjectACL API', () => {
586586
testObjACLRequest, log, next),
587587
], err => {
588588
assert(err instanceof Error);
589-
assert.strictEqual(err.code, errors.AccessDenied.code);
589+
assert.strictEqual(err.code, errorInstances.AccessDenied.code);
590590
done();
591591
});
592592
});

0 commit comments

Comments
 (0)