From 36718f05a36cf0b38c03c63777685b815f493b37 Mon Sep 17 00:00:00 2001 From: Lauren Spiegel Date: Tue, 16 Jan 2018 11:26:38 -0800 Subject: [PATCH 1/4] FIX: flaky azure test --- .../test/multipleBackend/listParts/azureListParts.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js b/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js index af7d0599a9..8aae719fa5 100644 --- a/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js +++ b/tests/functional/aws-node-sdk/test/multipleBackend/listParts/azureListParts.js @@ -6,8 +6,10 @@ const { describeSkipIfNotMultiple, azureLocation, getAzureContainerName } = require('../utils'); const azureContainerName = getAzureContainerName(); -const bodyFirstPart = Buffer.alloc(10); -const bodySecondPart = Buffer.alloc(104857610); +const firstPartSize = 10; +const bodyFirstPart = Buffer.alloc(firstPartSize); +const secondPartSize = 15; +const bodySecondPart = Buffer.alloc(secondPartSize); let bucketUtil; let s3; @@ -67,10 +69,10 @@ describeSkipIfNotMultiple('List parts of MPU on Azure data backend', () => { assert.equal(err, null, `Err listing parts: ${err}`); assert.strictEqual(data.Parts.length, 2); assert.strictEqual(data.Parts[0].PartNumber, 1); - assert.strictEqual(data.Parts[0].Size, 10); + assert.strictEqual(data.Parts[0].Size, firstPartSize); assert.strictEqual(data.Parts[0].ETag, this.test.firstEtag); assert.strictEqual(data.Parts[1].PartNumber, 2); - assert.strictEqual(data.Parts[1].Size, 104857610); + assert.strictEqual(data.Parts[1].Size, secondPartSize); assert.strictEqual(data.Parts[1].ETag, this.test.secondEtag); done(); }); @@ -85,7 +87,7 @@ describeSkipIfNotMultiple('List parts of MPU on Azure data backend', () => { (err, data) => { assert.equal(err, null, `Err listing parts: ${err}`); assert.strictEqual(data.Parts[0].PartNumber, 2); - assert.strictEqual(data.Parts[0].Size, 104857610); + assert.strictEqual(data.Parts[0].Size, secondPartSize); assert.strictEqual(data.Parts[0].ETag, this.test.secondEtag); done(); }); From bd93c7f4ab343a89bd9623ccedc8817c81be6608 Mon Sep 17 00:00:00 2001 From: Lauren Spiegel Date: Tue, 16 Jan 2018 15:07:16 -0800 Subject: [PATCH 2/4] CHORE: Lock utapi version to 7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf4b335c7f..c15f3d563e 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "node-uuid": "^1.4.3", "npm-run-all": "~4.0.2", "sproxydclient": "scality/sproxydclient#rel/7.2", - "utapi": "scality/utapi", + "utapi": "scality/utapi#rel/7.2", "utf8": "~2.1.1", "vaultclient": "scality/vaultclient#rel/7.2", "werelogs": "scality/werelogs#rel/7.2", From 0091f784b1130174ec9e06d9f8618720bdd9ce72 Mon Sep 17 00:00:00 2001 From: Anne Harper Date: Mon, 5 Feb 2018 12:50:30 +0100 Subject: [PATCH 3/4] S3C-1245 update dependencies --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 68b0640ab0..a8501fc019 100644 --- a/package.json +++ b/package.json @@ -20,28 +20,28 @@ "homepage": "https://github.com/scality/S3#readme", "dependencies": { "aws-sdk": "2.28.0", - "arsenal": "scality/Arsenal", + "arsenal": "scality/Arsenal#rel/7.4", "async": "~2.5.0", "google-auto-auth": "^0.9.1", "azure-storage": "^2.1.0", - "bucketclient": "scality/bucketclient", + "bucketclient": "scality/bucketclient#rel/7.4", "commander": "^2.9.0", "mongodb": "^2.2.31", "node-uuid": "^1.4.3", "npm-run-all": "~4.0.2", - "sproxydclient": "scality/sproxydclient", - "utapi": "scality/utapi", + "sproxydclient": "scality/sproxydclient#rel/7.4", + "utapi": "scality/utapi#rel/7.4", "utf8": "~2.1.1", "uuid": "^3.0.1", - "vaultclient": "scality/vaultclient", - "werelogs": "scality/werelogs", + "vaultclient": "scality/vaultclient#rel/7.4", + "werelogs": "scality/werelogs#rel/7.4", "xml2js": "~0.4.16" }, "devDependencies": { "bluebird": "^3.3.1", "eslint": "^2.4.0", "eslint-config-airbnb": "^6.0.0", - "eslint-config-scality": "scality/Guidelines", + "eslint-config-scality": "scality/Guidelines#rel/7.4", "ioredis": "2.4.0", "istanbul": "1.0.0-alpha.2", "istanbul-api": "1.0.0-alpha.13", @@ -49,11 +49,11 @@ "mocha": "^2.3.4", "mocha-junit-reporter": "1.11.1", "node-mocks-http": "^1.5.2", - "s3blaster": "scality/s3blaster", + "s3blaster": "scality/s3blaster#rel/7.4", "tv4": "^1.2.7" }, "optionalDependencies": { - "cdmiclient": "scality/cdmiclient" + "cdmiclient": "scality/cdmiclient#rel/7.4" }, "scripts": { "ft_awssdk": "cd tests/functional/aws-node-sdk && mocha test/", From 119c189deb80b1601415b70b4ac31299a69debf5 Mon Sep 17 00:00:00 2001 From: Anne Harper Date: Mon, 5 Feb 2018 14:26:10 +0100 Subject: [PATCH 4/4] S3C-1245 update dependencies: version trick --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a8501fc019..51553e83c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "s3", - "version": "7.2.0", + "version": "7.4.0", "description": "S3 connector", "main": "index.js", "engines": {