Skip to content

Commit 4dc8ed0

Browse files
Reenable bucket conductor test with bucketd
Issue: BB-295
1 parent 3fdd455 commit 4dc8ed0

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

tests/functional/lifecycle/LifecycleConductor.spec.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,8 @@ describe('lifecycle conductor', () => {
323323
mockBucketd,
324324
mockVault,
325325
setupZookeeper,
326-
skip,
327326
} = opts;
328327

329-
if (skip) {
330-
it.skip('should populate queue : ' +
331-
`${skip}`, () => { assert.fail(skip); });
332-
return;
333-
}
334-
335328
const bucketdPort = 14345;
336329
const vaultPort = 14346;
337330
const maxKeys = 2;
@@ -399,7 +392,7 @@ describe('lifecycle conductor', () => {
399392
}
400393

401394
if (mockVault) {
402-
lifecycleConfig.auth.vault.port = vaultPort;
395+
lifecycleConfig.conductor.vaultAdmin.port = vaultPort;
403396
}
404397

405398
lifecycleConfig.conductor.concurrency = maxKeys;
@@ -485,7 +478,7 @@ describe('lifecycle conductor', () => {
485478
afterEach(done => {
486479
async.series([
487480
next => {
488-
if (mockBucketd) {
481+
if (mockBucketd && bucketd) {
489482
bucketd.close(next);
490483
} else {
491484
process.nextTick(next);
@@ -581,7 +574,6 @@ describe('lifecycle conductor', () => {
581574
mockBucketd: true,
582575
mockVault: true,
583576
transformExpectedMessages: withAccountIds,
584-
skip: 'to be reintroduced with https://scality.atlassian.net/browse/BB-126',
585577
}
586578
])('$description', options => {
587579
describeConductorSpec(options);

0 commit comments

Comments
 (0)