File tree Expand file tree Collapse file tree 1 file changed +2
-9
lines changed
tests/functional/lifecycle Expand file tree Collapse file tree 1 file changed +2
-9
lines changed Original file line number Diff line number Diff 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 ;
@@ -400,6 +393,7 @@ describe('lifecycle conductor', () => {
400393
401394 if ( mockVault ) {
402395 lifecycleConfig . auth . vault . port = vaultPort ;
396+ lifecycleConfig . conductor . vaultAdmin = lifecycleConfig . auth . vault ;
403397 }
404398
405399 lifecycleConfig . conductor . concurrency = maxKeys ;
@@ -485,7 +479,7 @@ describe('lifecycle conductor', () => {
485479 afterEach ( done => {
486480 async . series ( [
487481 next => {
488- if ( mockBucketd ) {
482+ if ( mockBucketd && bucketd ) {
489483 bucketd . close ( next ) ;
490484 } else {
491485 process . nextTick ( next ) ;
@@ -581,7 +575,6 @@ describe('lifecycle conductor', () => {
581575 mockBucketd : true ,
582576 mockVault : true ,
583577 transformExpectedMessages : withAccountIds ,
584- skip : 'to be reintroduced with https://scality.atlassian.net/browse/BB-126' ,
585578 }
586579 ] ) ( '$description' , options => {
587580 describeConductorSpec ( options ) ;
You can’t perform that action at this time.
0 commit comments