Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ describe('aws-node-sdk test putBucketReplication bucket status', () => {
it('should put configuration on a bucket with versioning', done =>
checkVersioningError(s3, 'Enabled', null, done));

it('should put configuration on a bucket with versioning if ' +
// S3C doesn't support service account. There is no cross account access for replication account.
// (canonicalId looking like http://acs.zenko.io/accounts/service/replication)
const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
itSkipS3C('should put configuration on a bucket with versioning if ' +
'user is a replication user', done =>
checkVersioningError(replicationAccountS3, 'Enabled', null, done));
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ describe('aws-node-sdk test bucket versioning', function testSuite() {
s3.putBucketVersioning(params, done);
});

it('should accept valid versioning configuration if user is a ' +
// S3C doesn't support service account. There is no cross account access for replication account.
// (canonicalId looking like http://acs.zenko.io/accounts/service/replication)
const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
itSkipS3C('should accept valid versioning configuration if user is a ' +
'replication user', done => {
const params = {
Bucket: bucket,
Expand Down
8 changes: 5 additions & 3 deletions tests/functional/aws-node-sdk/test/object/copyPart.js
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,9 @@ describe('Object Part Copy', () => {
});
});

it('should not copy a part of a cold object', done => {
// S3C doesn't support cold storage and restore
const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
itSkipS3C('should not copy a part of a cold object', done => {
const archive = {
archiveInfo: {
archiveId: '97a71dfe-49c1-4cca-840a-69199e0b0322',
Expand All @@ -734,7 +736,7 @@ describe('Object Part Copy', () => {
});
});

it('should copy a part of an object when it\'s transitioning to cold', done => {
itSkipS3C('should copy a part of an object when it\'s transitioning to cold', done => {
fakeMetadataTransition(sourceBucketName, sourceObjName, undefined, err => {
assert.ifError(err);
s3.uploadPartCopy({
Expand All @@ -752,7 +754,7 @@ describe('Object Part Copy', () => {
});
});

it('should copy a part of a restored object', done => {
itSkipS3C('should copy a part of a restored object', done => {
const archiveCompleted = {
archiveInfo: {},
restoreRequestedAt: new Date(0),
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/aws-node-sdk/test/object/mpuVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {

// TODO: CLDSRV-721 RING 10 Support ObjectRestore (cold storage) with MD v1
// The whole test suite is skipped as bad versionId breaks after each bucket cleanup
const describeSkipNullMdV1 = isNullKeyMetadataV1 ? describe.skip : describe;
const describeSkipNullMdV1 = isNullKeyMetadataV1 || process.env.S3_END_TO_END ? describe.skip : describe;

describeSkipNullMdV1('MPU with x-scal-s3-version-id header', () => {
withV4(sigCfg => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,13 @@ describe("Head object 'ReplicationStatus' value", () => {
done => checkHeadObj(`${keyPrefix}-foobar`, undefined, done));

describe('With bucket replication config', () => {
const role = process.env.S3_END_TO_END
? 'arn:aws:iam::123456789012:role/src-resource,arn:aws:iam::123456789012:role/dest-resource'
: 'arn:aws:iam::123456789012:role/src-resource';
beforeEach(done => s3.putBucketReplication({
Bucket: sourceBucket,
ReplicationConfiguration: {
Role: 'arn:aws:iam::123456789012:role/src-resource',
Role: role,
Rules: [
{
Destination: { StorageClass: 'us-east-2',
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/aws-node-sdk/test/object/putVersion.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function checkObjMdAndUpdate(objMDBefore, objMDAfter, props) {

// TODO: CLDSRV-721 RING 10 Support ObjectRestore (cold storage) with MD v1
// The whole test suite is skipped as bad versionId breaks after each bucket cleanup
const describeSkipNullMdV1 = isNullKeyMetadataV1 ? describe.skip : describe;
const describeSkipNullMdV1 = isNullKeyMetadataV1 || process.env.S3_END_TO_END ? describe.skip : describe;

describeSkipNullMdV1('PUT object with x-scal-s3-version-id header', () => {
withV4(sigCfg => {
Expand Down
Loading