@@ -22,7 +22,9 @@ async function cleanBucket(bucketUtils, s3, Bucket) {
2222 await bucketUtils . empty ( Bucket , true ) ;
2323 await bucketUtils . deleteOne ( Bucket ) ;
2424 } catch ( error ) {
25- console . error ( `Error cleaning bucket ${ Bucket } :` , error ) ;
25+ process . stdout
26+ . write ( `Error emptying and deleting bucket: ${ error } \n` ) ;
27+ // ignore the error and continue
2628 }
2729}
2830
@@ -39,7 +41,6 @@ async function cleanAllBuckets(bucketUtils, s3) {
3941
4042 // clean sequentially to avoid overloading
4143 for ( const bucket of list . Buckets ) {
42- console . log ( `Cleaning bucket: ${ bucket . Name } ` ) ;
4344 await cleanBucket ( bucketUtils , s3 , bucket . Name ) ;
4445 }
4546 }
@@ -127,7 +128,6 @@ describeFn('GET Service - AWS.S3.listBuckets', function getService() {
127128 . map ( i => `getservicebuckets-${ i } ` ) ;
128129
129130 before ( done => {
130- console . log ( 'sigCfg' , sigCfg ) ;
131131 bucketUtil = new BucketUtility ( 'default' , sigCfg ) ;
132132 s3 = bucketUtil . s3 ;
133133 async . series ( [
@@ -143,13 +143,13 @@ describeFn('GET Service - AWS.S3.listBuckets', function getService() {
143143 moveOn ( ) ;
144144 } )
145145 . catch ( err => {
146- console . log ( 'Error creating bucket:' , err ) ;
147146 moveOn ( err ) ;
148147 } ) ;
149148 } ,
150149 err => {
151150 if ( err ) {
152- process . stdout . write ( `err creating buckets: ${ err } ` ) ;
151+ process . stdout . write ( `err creating buckets: ${ err } \n` ) ;
152+ return next ( err ) ;
153153 }
154154 next ( err ) ;
155155 } )
@@ -167,7 +167,9 @@ describeFn('GET Service - AWS.S3.listBuckets', function getService() {
167167 }
168168 moveOn ( ) ;
169169 } )
170- . catch ( moveOn ) ;
170+ . catch ( ( ) => {
171+ moveOn ( ) ;
172+ } ) ;
171173 } ,
172174 err => {
173175 if ( err ) {
@@ -177,11 +179,15 @@ describeFn('GET Service - AWS.S3.listBuckets', function getService() {
177179 } ) ;
178180 } ) ;
179181
180- it . only ( 'should list buckets concurrently' , done => {
182+ it ( 'should list buckets concurrently' , done => {
181183 async . times ( 20 , ( n , next ) => {
182184 s3 . send ( new ListBucketsCommand ( { } ) )
183185 . then ( result => {
184- assert . equal ( result . Buckets . length ,
186+ // Filter for our test buckets only
187+ const ourBuckets = result . Buckets . filter ( bucket =>
188+ bucket . Name . startsWith ( 'getservicebuckets-' )
189+ ) ;
190+ assert . equal ( ourBuckets . length ,
185191 createdBuckets . length ,
186192 'Created buckets are missing in response' ) ;
187193 next ( ) ;
0 commit comments