fixups

Author: benzekrimaha

tests/multipleBackend/routes/routeBackbeat.js

@@ -200,25 +200,13 @@ const itSkipS3C = process.env.S3_END_TO_END ? it.skip : it;
 // FIXME: does not pass for Ceph, see CLDSRV-443
 describeSkipIfNotMultipleOrCeph('backbeat DELETE routes', () => {
     it('abort MPU', done => {
-        // Skip test if AWS backend is not properly configured
-        if (!awsClient || !awsBucket) {
-            return done();
-        }
-        
         const awsKey = 'backbeat-mpu-test';
         async.waterfall([
             next => {
                 awsClient.send(new CreateMultipartUploadCommand({
                     Bucket: awsBucket,
                     Key: awsKey,
-                })).then(response => next(null, response)).catch(err => {
-                    // If bucket doesn't exist, skip the test
-                    if (err.Code === 'NoSuchBucket') {
-                        console.log(`Skipping test: AWS bucket ${awsBucket} does not exist`);
-                        return done();
-                    }
-                    next(err);
-                });
+                })).then(response => next(null, response)).catch(err => next(err));
             },
             (response, next) => {
                 const { UploadId } = response;
@@ -362,12 +350,7 @@ describe('backbeat routes', () => {
         beforeEach(() => {
             bucket = generateUniqueBucketName(BUCKET_FOR_NULL_VERSION_PREFIX);
             return bucketUtil.emptyIfExists(bucket)
-                .then(() => s3.send(new CreateBucketCommand({ Bucket: bucket })).then(result => {
-                    console.log(`Created bucket ${result}`);
-                }).catch(err => {
-                    console.error(`Error creating bucket ${bucket}: `, err);
-                    throw err;
-                }));
+                .then(() => s3.send(new CreateBucketCommand({ Bucket: bucket })));
         });
 
         afterEach(() => bucketUtil.empty(bucket)
@@ -383,10 +366,8 @@ describe('backbeat routes', () => {
                         Key: keyName,
                         Body: Buffer.from(testData),
                     })).then(result => {
-                        console.log('PutObject result: ', result);
                         next(null, result);
                     }).catch(err => {
-                        console.error('Error putting object: ', err);
                         next(err);
                     });
                 },
@@ -395,10 +376,8 @@ describe('backbeat routes', () => {
                         Bucket: bucket,
                         VersioningConfiguration: { Status: 'Enabled' },
                     })).then(result => {
-                        console.log('PutBucketVersioning result: ', result);
                         next(null, result);
                     }).catch(err => {
-                        console.error('Error putting bucket versioning: ', err);
                         next(err);
                     });
                 },
@@ -438,10 +417,8 @@ describe('backbeat routes', () => {
                     Key: keyName,
                     VersionId: 'null',
                 })).then(result => {
-                    console.log('HeadObject result: ', result);
                     next(null, result);
                 }).catch(err => {
-                    console.error('Error getting head object: ', err);
                     next(err);
                 }),
                 getMetadataAfter: next => makeBackbeatRequest({
@@ -456,18 +433,15 @@ describe('backbeat routes', () => {
                 }, next),
                 listObjectVersions: next => s3.send(new ListObjectVersionsCommand({
                     Bucket: bucket,
-                })).then(result => { 
-                    console.log('ListObjectVersions result: ', result);
+                })).then(result => {
                     next(null, result); 
                 }).catch(err => {
-                    console.error('Error listing object versions: ', err);
                     next(err);
                 }),
             }, (err, results) => {
                 if (err) {
                     return done(err);
                 }
-                console.log('Results: ', results);
                 const headObjectRes = results.headObject;
                 assert.strictEqual(headObjectRes.VersionId, 'null');
                 assert.strictEqual(headObjectRes.StorageClass, storageClass);
@@ -3248,11 +3222,9 @@ describe('backbeat routes', () => {
                         Key: testKey,
                         Body: Buffer.from('hello'),
                     })).then(data => {
-                        console.log('put object success', data);
                         versionId = data.VersionId;
                         done();
                     }).catch(err => {
-                        console.error('Error putting object:', err);
                         done(err);
                     });
                 },
@@ -3292,14 +3264,12 @@ describe('backbeat routes', () => {
                     s3.send(new GetObjectCommand({
                         Bucket: TEST_BUCKET,
                         Key: testKey,
-                    })).then(result => {
-                        console.log(`Successfully retrieved object ${result}`);
+                    })).then(() => {
                         done(new Error('Expected error'));
                     }).catch(err => {
-                        console.log('Get object error (expected):', err);
                         // should error out as location shall no longer exist
                         assert(err);
-                        assert.strictEqual(err.$metadata.statusCode, 503);
+                        assert.strictEqual(err.$metadata.httpStatusCode, 503);
                         done();
                     });
                 },
@@ -3499,7 +3469,6 @@ describe('backbeat routes', () => {
                         Bucket: awsBucket,
                         Key: awsKey,
                     })).then(data => {
-                        console.log(data);
                         assert.deepStrictEqual(data.TagSet, []);
                         next();
                     }).catch(err => {
@@ -3590,7 +3559,7 @@ describe('backbeat routes', () => {
                         authCredentials: backbeatAuthCredentials,
                         hostname: ipAddress,
                         port: 8000,
-
+                        
                         method: 'POST',
                         path:
                             `/_/backbeat/batchdelete/${containerName}/${blob}`,

tests/multipleBackend/routes/routeBackbeatForReplication.js

@@ -1947,7 +1947,6 @@ describe(`backbeat routes for replication (${name})`, () => {
             if (err) {
                 return done(err);
             }
-            console.log('Results: ', results);
             const firstHeadObjectRes = results.headObjectByVersionId;
             assert.strictEqual(firstHeadObjectRes.VersionId, versionId);