Skip to content

Commit 8725888

Browse files
author
Will Toozs
committed
fixup: remove skips
1 parent 111ecf8 commit 8725888

24 files changed

Lines changed: 50 additions & 74 deletions

tests/functional/kmip/serverside_encryption.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ describe('KMIP backed server-side encryption', () => {
162162
});
163163
});
164164

165-
// TODO CLDSRV-431 remove skip
166-
it.skip('should allow object copy with SSE header in encrypted bucket', done => {
165+
it('should allow object copy with SSE header in encrypted bucket', done => {
167166
async.waterfall([
168167
next => _createBucket(bucketName, false, err => next(err)),
169168
next => _putObject(bucketName, objectName, false, err => next(err)),
@@ -176,8 +175,7 @@ describe('KMIP backed server-side encryption', () => {
176175
done();
177176
});
178177
});
179-
// TODO CLDSRV-431 remove skip
180-
it.skip('should allow creating mpu with SSE header ' +
178+
it('should allow creating mpu with SSE header ' +
181179
'in encrypted bucket', done => {
182180
async.waterfall([
183181
next => _createBucket(bucketName, true, err => next(err)),

tests/multipleBackend/multipartUpload.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ function abortMultipleMpus(backendsInfo, callback) {
320320
callback();
321321
});
322322
}
323-
// TODO CLDSRV-431 remove skip
324-
describe.skip('Multipart Upload API with AWS Backend', function mpuTestSuite() {
323+
describe('Multipart Upload API with AWS Backend', function mpuTestSuite() {
325324
this.timeout(60000);
326325

327326
beforeEach(done => {

tests/multipleBackend/objectCopy.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ function copySetup(params, cb) {
7171
callback),
7272
], err => cb(err));
7373
}
74-
// TODO CLDSRV-431 remove skip
75-
describe.skip('ObjectCopy API with multiple backends', () => {
74+
describe('ObjectCopy API with multiple backends', () => {
7675
before(() => {
7776
cleanup();
7877
});

tests/multipleBackend/objectPutCopyPart.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ const awsLocation2 = 'awsbackend2';
3333
const awsLocationMismatch = 'awsbackendmismatch';
3434
const partETag = 'be747eb4b75517bf6b3cf7c5fbb62f3a';
3535

36-
// TODO CLDSRV-431 reenable
37-
// const describeSkipIfE2E = process.env.S3_END_TO_END ? describe.skip : describe;
36+
const describeSkipIfE2E = process.env.S3_END_TO_END ? describe.skip : describe;
3837

3938
function getSourceAndDestKeys() {
4039
const timestamp = Date.now();
@@ -175,9 +174,7 @@ function assertPartList(partList, uploadId) {
175174
assert.strictEqual(partList.Parts[0].Size, 11);
176175
}
177176

178-
// TODO CLDSRV-431 remove skip
179-
// describeSkipIfE2E('ObjectCopyPutPart API with multiple backends',
180-
describe.skip('ObjectCopyPutPart API with multiple backends',
177+
describeSkipIfE2E('ObjectCopyPutPart API with multiple backends',
181178
function testSuite() {
182179
this.timeout(60000);
183180

tests/multipleBackend/objectPutPart.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ const md5Hash2 = crypto.createHash('md5');
3737
const calculatedHash1 = md5Hash1.update(body1).digest('hex');
3838
const calculatedHash2 = md5Hash2.update(body2).digest('hex');
3939

40-
// TODO CLDSRV-431 reenable
41-
// const describeSkipIfE2E = process.env.S3_END_TO_END ? describe.skip : describe;
40+
const describeSkipIfE2E = process.env.S3_END_TO_END ? describe.skip : describe;
4241

4342
function _getOverviewKey(objectKey, uploadId) {
4443
return `overview${splitter}${objectKey}${splitter}${uploadId}`;
@@ -169,9 +168,7 @@ function listAndAbort(uploadId, calculatedHash2, objectName, done) {
169168
});
170169
});
171170
}
172-
// TODO CLDSRV-431 remove skip
173-
// describeSkipIfE2E('objectPutPart API with multiple backends',
174-
describe.skip('objectPutPart API with multiple backends',
171+
describeSkipIfE2E('objectPutPart API with multiple backends',
175172
function testSuite() {
176173
this.timeout(5000);
177174

tests/unit/api/bucketACLauth.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ const bucket = new BucketInfo('niftyBucket', ownerCanonicalId,
1818
authInfo.getAccountDisplayName(), creationDate);
1919
const log = new DummyRequestLogger();
2020

21-
// TODO CLDSRV-431 remove skip
22-
describe.skip('bucket authorization for bucketGet, bucketHead, ' +
21+
describe('bucket authorization for bucketGet, bucketHead, ' +
2322
'objectGet, and objectHead', () => {
2423
// Reset the bucket ACLs
2524
afterEach(() => {

tests/unit/api/bucketDelete.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ describe('bucketDelete API', () => {
129129
});
130130
});
131131

132-
// TODO CLDSRV-431 remove skip
133-
it.skip('should not return an error if the bucket has an initiated mpu',
132+
it('should not return an error if the bucket has an initiated mpu',
134133
done => {
135134
bucketPut(authInfo, testRequest, log, err => {
136135
assert.strictEqual(err, null);
@@ -160,13 +159,11 @@ describe('bucketDelete API', () => {
160159
});
161160
});
162161

163-
// TODO CLDSRV-431 remove skip
164-
it.skip('should delete a bucket even if the bucket has ongoing mpu',
162+
it('should delete a bucket even if the bucket has ongoing mpu',
165163
done => createMPU(testRequest, initiateRequest, false, done));
166164

167-
// TODO CLDSRV-431 remove skip
168165
// if only part object (and no overview objects) is in mpu shadow bucket
169-
it.skip('should delete a bucket even if the bucket has an orphan part',
166+
it('should delete a bucket even if the bucket has an orphan part',
170167
done => createMPU(testRequest, initiateRequest, true, done));
171168

172169

tests/unit/api/bucketHead.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ const testRequest = {
1616
url: '/',
1717
iamAuthzResults: false,
1818
};
19-
// TODO CLDSRV-431 remove skip
20-
describe.skip('bucketHead API', () => {
19+
describe('bucketHead API', () => {
2120
beforeEach(() => {
2221
cleanup();
2322
});

tests/unit/api/deleteMarker.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ const undefHeadersExpected = [
9999
'expires',
100100
];
101101

102-
// TODO CLDSRV-431 remove skip
103-
describe.skip('delete marker creation', () => {
102+
describe('delete marker creation', () => {
104103
beforeEach(done => {
105104
cleanup();
106105
bucketPut(authInfo, testPutBucketRequest, log, err => {

tests/unit/api/deletedFlagBucket.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,7 @@ function confirmDeleted(done) {
105105
});
106106
}
107107

108-
// TODO CLDSRV-431 remove skip
109-
describe.skip('deleted flag bucket handling', () => {
108+
describe('deleted flag bucket handling', () => {
110109
beforeEach(done => {
111110
cleanup();
112111
const bucketMD = new BucketInfo(bucketName, canonicalID,

0 commit comments

Comments
 (0)