Skip to content

Commit fdacd95

Browse files
CLDSRV-717: Reinclude S3C specifics from 7.70
1 parent 288606a commit fdacd95

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

tests/multipleBackend/routes/routeBackbeat.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ const testMd = {
8484
},
8585
};
8686

87+
// S3_TESTVAL_OWNERCANONICALID variable is used by Integration that runs E2E tests with real Vault account.
88+
if (process.env.S3_TESTVAL_OWNERCANONICALID) {
89+
testMd['owner-id'] = process.env.S3_TESTVAL_OWNERCANONICALID;
90+
}
91+
8792
const nonVersionedTestMd = {
8893
'owner-display-name': 'Bart',
8994
'owner-id': ('79a59df900b949e55d96a1e698fbaced' +
@@ -168,6 +173,7 @@ const describeIfLocationAws = hasLocation(awsLocation) ? describe : describe.ski
168173
const itIfLocationAwsSkipCeph = hasLocation(awsLocation) ? itSkipCeph : it.skip;
169174
const itIfLocationAws = hasLocation(awsLocation) ? it : it.skip;
170175
const itIfLocationAzure = hasLocation(azureLocation) ? it : it.skip;
176+
const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
171177

172178
// FIXME: does not pass for Ceph, see CLDSRV-443
173179
describeSkipIfNotMultipleOrCeph('backbeat DELETE routes', () => {
@@ -2647,7 +2653,8 @@ describe('backbeat routes', () => {
26472653
done();
26482654
});
26492655
});
2650-
it('should skip batch delete of a non-existent location', done => {
2656+
// TODO: unskip test when S3C-9123 is fixed
2657+
itSkipS3C('should skip batch delete of a non-existent location', done => {
26512658
async.series([
26522659
done => {
26532660
const options = {

0 commit comments

Comments
 (0)