fixup

Author: benzekrimaha

tests/functional/aws-node-sdk/test/object/deleteObject.js

@@ -15,8 +15,6 @@ const {
 const withV4 = require('../support/withV4');
 const BucketUtility = require('../../lib/utility/bucket-util');
 const changeObjectLock = require('../../../../utilities/objectLock-util');
-const { S3 } = require('aws-sdk');
-
 const objectName = 'key';
 const objectNameTwo = 'secondkey';
 
@@ -448,26 +446,23 @@ describe('DELETE object', () => {
                     const pastDate = new Date(objectLastModified.getTime() - 60_000); // 1 minute earlier
                     const futureDate = new Date(objectLastModified.getTime() + 60_000); // 1 minute later
 
-                    deleteObjectConditional(S3, {
+                    deleteObjectConditional(s3, {
                         Bucket: bucketName,
                         Key: testObjectKey,
                     }, {
                         'If-Modified-Since': pastDate.toUTCString(),
                         'If-Unmodified-Since': futureDate.toUTCString(),
                     }, (err, data) => {
-                        assert.ifError(err);
                         assert.deepStrictEqual(data.$metadata.httpStatusCode, 204);
                         s3.send(new HeadObjectCommand({
                             Bucket: bucketName,
                             Key: testObjectKey,
                         }))
-                            .then(() => {
-                                assert.fail('Object should not exist');
-                            })
-                            .catch(err => {
-                                assert.strictEqual(err.name, 'NotFound');
-                                done();
-                            });
+                        .catch(err => {
+                            assert.strictEqual(err.name, 'NotFound');
+                            assert.strictEqual(err.$metadata.httpStatusCode, 404);
+                            done();
+                        });
                     });
                 });
             });

tests/functional/aws-node-sdk/test/object/get.js

@@ -231,7 +231,7 @@ describe('GET object', () => {
                 s3.send(new GetObjectCommand({ Bucket: '', Key: 'somekey' })).then(() => {
                     assert.fail('Expected failure but got success');
                 }).catch(err => {
-                    assert.strictEqual(err.name, 'MethodNotAllowed');
+                    assert.strictEqual(err.message, 'Empty value provided for input HTTP label: Bucket.');
                     return done();
                 });
             });

tests/functional/aws-node-sdk/test/object/getPartSize.js

@@ -166,15 +166,13 @@ describe('Part size tests with object head', () => {
             });
         });
 
-        it('should return an error when incorrect --part-number is used',
-            done => {
-                headObject({ PartNumber: partNumbers.length + 1 },
-                (err, data) => {
-                    checkError(err, 416, 'InvalidRange');
-                    assert.strictEqual(data, undefined);
-                    done();
-                });
+        it('should return an error when incorrect --part-number is used', done => {
+            headObject({ PartNumber: partNumbers.length + 1 },
+            err => {
+                checkError(err, '', 416);
+                done();
             });
+        });
 
         it('should return content-length 0 when requesting part 1 of empty object', done => {
             headObject({ Key: emptyObject, PartNumber: 1 }, (err, data) => {
@@ -185,12 +183,11 @@ describe('Part size tests with object head', () => {
         });
 
         it('should return an error when requesting part 2 of empty object', done => {
-            headObject({ Key: emptyObject, PartNumber: 2 }, (err, data) => {
-                checkError(err, 416, 'InvalidRange');
-                assert.strictEqual(data, undefined);
+            headObject({ Key: emptyObject, PartNumber: 2 }, err => {
+                checkError(err, '', 416);
                 done();
             });
-        });
+        }); 
 
         it('should return content-length requesting part 1 of non-MPU object', done => {
             headObject({ Key: nonMpuObject, PartNumber: 1 }, (err, data) => {
@@ -202,7 +199,7 @@ describe('Part size tests with object head', () => {
 
         it('should return an error when requesting part 2 of non-MPU object', done => {
             headObject({ Key: nonMpuObject, PartNumber: 2 }, (err, data) => {
-                checkError(err, 416, 'InvalidRange');
+                checkError(err, '', 416);
                 assert.strictEqual(data, undefined);
                 done();
             });