From b43b965daa55111853c8b3513e3e33d1e16c8cc1 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 8 Jul 2020 18:58:18 +0800 Subject: [PATCH] fix unstable test case --- ...reate_page_blob_should_work_with_tags.json | 236 ++++++++---------- ..._create_page_blob_should_work_with_tags.js | 79 +++--- .../storage-blob/test/blobclient.spec.ts | 6 +- 3 files changed, 143 insertions(+), 178 deletions(-) diff --git a/sdk/storage/storage-blob/recordings/browsers/blobclient/recording_create_page_blob_should_work_with_tags.json b/sdk/storage/storage-blob/recordings/browsers/blobclient/recording_create_page_blob_should_work_with_tags.json index a17a4d50413e..33fee4567bf4 100644 --- a/sdk/storage/storage-blob/recordings/browsers/blobclient/recording_create_page_blob_should_work_with_tags.json +++ b/sdk/storage/storage-blob/recordings/browsers/blobclient/recording_create_page_blob_should_work_with_tags.json @@ -1,128 +1,112 @@ { - "recordings": [ - { - "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138", - "query": { - "restype": "container" - }, - "requestBody": null, - "status": 201, - "response": "", - "responseHeaders": { - "content-length": "0", - "date": "Sun, 14 Jun 2020 16:29:04 GMT", - "etag": "\"0x8D810800E6D6B53\"", - "last-modified": "Sun, 14 Jun 2020 16:29:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "376f6566-9821-4b9b-880b-55159adec41a", - "x-ms-request-id": "1ae6a4be-c01e-0009-3868-420873000000", - "x-ms-version": "2019-12-12" - } - }, - { - "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138/blob159215214568105710", - "query": {}, - "requestBody": "Hello World", - "status": 201, - "response": "", - "responseHeaders": { - "content-length": "0", - "content-md5": "sQqNsWTgdUEFt6mb5y4/5Q==", - "date": "Sun, 14 Jun 2020 16:29:04 GMT", - "etag": "\"0x8D810800E70F802\"", - "last-modified": "Sun, 14 Jun 2020 16:29:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "1193106c-73e5-46de-8fa8-e947aa7f4e9d", - "x-ms-content-crc64": "YeJLfssylmU=", - "x-ms-request-id": "1ae6a4ce-c01e-0009-4768-420873000000", - "x-ms-request-server-encrypted": "true", - "x-ms-version": "2019-12-12", - "x-ms-version-id": "2020-06-14T16:29:05.7068034Z" - } - }, - { - "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138/blob159215214568105710", - "query": {}, - "requestBody": null, - "status": 202, - "response": "", - "responseHeaders": { - "content-length": "0", - "date": "Sun, 14 Jun 2020 16:29:04 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "225c4216-fc1a-4b3a-8911-ee55cea68005", - "x-ms-delete-type-permanent": "false", - "x-ms-request-id": "1ae6a4d9-c01e-0009-5268-420873000000", - "x-ms-version": "2019-12-12" - } - }, - { - "method": "PUT", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138/blob159215214568105710", - "query": {}, - "requestBody": null, - "status": 201, - "response": "", - "responseHeaders": { - "content-length": "0", - "date": "Sun, 14 Jun 2020 16:29:05 GMT", - "etag": "\"0x8D810800E7936E3\"", - "last-modified": "Sun, 14 Jun 2020 16:29:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "f8bf5fce-9e5a-4950-9305-627f6369d7b0", - "x-ms-request-id": "1ae6a4ed-c01e-0009-6368-420873000000", - "x-ms-request-server-encrypted": "true", - "x-ms-version": "2019-12-12", - "x-ms-version-id": "2020-06-14T16:29:05.7608419Z" - } - }, - { - "method": "GET", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138/blob159215214568105710", - "query": { - "comp": "tags" - }, - "requestBody": null, - "status": 200, - "response": "\ntag1val1tag2val2", - "responseHeaders": { - "content-length": "162", - "content-type": "application/xml", - "date": "Sun, 14 Jun 2020 16:29:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "1fbcc47c-c8d1-4619-80f1-13c25010ffd3", - "x-ms-request-id": "1ae6a4f7-c01e-0009-6c68-420873000000", - "x-ms-version": "2019-12-12" - } - }, - { - "method": "DELETE", - "url": "https://fakestorageaccount.blob.core.windows.net/container159215214566001138", - "query": { - "restype": "container" - }, - "requestBody": null, - "status": 202, - "response": "", - "responseHeaders": { - "content-length": "0", - "date": "Sun, 14 Jun 2020 16:29:05 GMT", - "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", - "x-ms-client-request-id": "692c3493-a4dc-466c-ba91-50536d81b564", - "x-ms-request-id": "1ae6a4fe-c01e-0009-7268-420873000000", - "x-ms-version": "2019-12-12" - } - } - ], - "uniqueTestInfo": { - "uniqueName": { - "container": "container159215214566001138", - "blob": "blob159215214568105710" - }, - "newDate": {} + "recordings": [ + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/container159420469771606879", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Wed, 08 Jul 2020 10:38:18 GMT", + "etag": "\"0x8D8232B078767CD\"", + "last-modified": "Wed, 08 Jul 2020 10:38:18 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "3c7ae600-ae4c-40db-ab3f-78a4d4616030", + "x-ms-request-id": "86aac6f6-601e-0000-7913-554da0000000", + "x-ms-version": "2019-12-12" + } }, - "hash": "c34d2c75258fc3dc2706eefcc0df3305" -} + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/container159420469771606879/blob159420469928900565", + "query": {}, + "requestBody": "Hello World", + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "content-md5": "sQqNsWTgdUEFt6mb5y4/5Q==", + "date": "Wed, 08 Jul 2020 10:38:18 GMT", + "etag": "\"0x8D8232B07EBFD43\"", + "last-modified": "Wed, 08 Jul 2020 10:38:19 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "904604fa-d73c-4632-96d1-07d02d05e4b0", + "x-ms-content-crc64": "YeJLfssylmU=", + "x-ms-request-id": "86aac713-601e-0000-0d13-554da0000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12", + "x-ms-version-id": "2020-07-08T10:38:19.6407386Z" + } + }, + { + "method": "PUT", + "url": "https://fakestorageaccount.blob.core.windows.net/container159420469771606879/pageBlobName159420469995507619", + "query": {}, + "requestBody": null, + "status": 201, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Wed, 08 Jul 2020 10:38:19 GMT", + "etag": "\"0x8D8232B084837C8\"", + "last-modified": "Wed, 08 Jul 2020 10:38:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "b2384280-5afd-4dea-9a83-0e68c5c4fe4b", + "x-ms-request-id": "86aac724-601e-0000-1b13-554da0000000", + "x-ms-request-server-encrypted": "true", + "x-ms-version": "2019-12-12", + "x-ms-version-id": "2020-07-08T10:38:20.2441672Z" + } + }, + { + "method": "GET", + "url": "https://fakestorageaccount.blob.core.windows.net/container159420469771606879/pageBlobName159420469995507619", + "query": { + "comp": "tags" + }, + "requestBody": null, + "status": 200, + "response": "\ntag1val1tag2val2", + "responseHeaders": { + "content-length": "162", + "content-type": "application/xml", + "date": "Wed, 08 Jul 2020 10:38:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "317c3fb8-837a-4265-a71f-e517bb5b43a7", + "x-ms-request-id": "86aac74f-601e-0000-3e13-554da0000000", + "x-ms-version": "2019-12-12" + } + }, + { + "method": "DELETE", + "url": "https://fakestorageaccount.blob.core.windows.net/container159420469771606879", + "query": { + "restype": "container" + }, + "requestBody": null, + "status": 202, + "response": "", + "responseHeaders": { + "content-length": "0", + "date": "Wed, 08 Jul 2020 10:38:20 GMT", + "server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0", + "x-ms-client-request-id": "cd9a2ee6-9754-45cf-a9c5-a6297bf33678", + "x-ms-request-id": "86aac7ae-601e-0000-0b13-554da0000000", + "x-ms-version": "2019-12-12" + } + } + ], + "uniqueTestInfo": { + "uniqueName": { + "container": "container159420469771606879", + "blob": "blob159420469928900565", + "pageBlobName": "pageBlobName159420469995507619" + }, + "newDate": {} + }, + "hash": "fa76d077d58ae9cea095b4077e19bff8" +} \ No newline at end of file diff --git a/sdk/storage/storage-blob/recordings/node/blobclient/recording_create_page_blob_should_work_with_tags.js b/sdk/storage/storage-blob/recordings/node/blobclient/recording_create_page_blob_should_work_with_tags.js index 5c203d977c2b..c7036702581b 100644 --- a/sdk/storage/storage-blob/recordings/node/blobclient/recording_create_page_blob_should_work_with_tags.js +++ b/sdk/storage/storage-blob/recordings/node/blobclient/recording_create_page_blob_should_work_with_tags.js @@ -1,48 +1,48 @@ let nock = require('nock'); -module.exports.hash = "184b097fcb4977a8460852c49c3f8c09"; +module.exports.hash = "c3fa0e848603d3beaad046037ca4df9b"; -module.exports.testInfo = {"uniqueName":{"container":"container159210827181806334","blob":"blob159210827183307824"},"newDate":{}} +module.exports.testInfo = {"uniqueName":{"container":"container159420386126901694","blob":"blob159420386262203456","pageBlobName":"pageBlobName159420386292509625"},"newDate":{}} nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/container159210827181806334') + .put('/container159420386126901694') .query(true) .reply(201, "", [ 'Content-Length', '0', 'Last-Modified', - 'Sun, 14 Jun 2020 04:17:51 GMT', + 'Wed, 08 Jul 2020 10:24:22 GMT', 'ETag', - '"0x8D81019E791CAA6"', + '"0x8D8232914D44892"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c1308dcc-201e-003e-3a02-42dadf000000', + 'b197f848-001e-0006-0811-55c1d9000000', 'x-ms-client-request-id', - '614f5d0b-017e-40db-8de4-a80c9cbdbf41', + '97f0e8d9-f01e-414c-88d6-d7689cbed33c', 'x-ms-version', '2019-12-12', 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' + 'Wed, 08 Jul 2020 10:24:21 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/container159210827181806334/blob159210827183307824', "Hello World") + .put('/container159420386126901694/blob159420386262203456', "Hello World") .reply(201, "", [ 'Content-Length', '0', 'Content-MD5', 'sQqNsWTgdUEFt6mb5y4/5Q==', 'Last-Modified', - 'Sun, 14 Jun 2020 04:17:51 GMT', + 'Wed, 08 Jul 2020 10:24:22 GMT', 'ETag', - '"0x8D81019E794A7BD"', + '"0x8D823291504D6AD"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c1308dd1-201e-003e-3e02-42dadf000000', + 'b197f932-001e-0006-5f11-55c1d9000000', 'x-ms-client-request-id', - 'd6a90b3c-c7a1-4a9a-9432-dfb3f05b35e1', + 'aedc106c-e0b2-4b71-81fb-b242548d2bb2', 'x-ms-version', '2019-12-12', 'x-ms-content-crc64', @@ -50,57 +50,38 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'x-ms-request-server-encrypted', 'true', 'x-ms-version-id', - '2020-06-14T04:17:51.8431165Z', + '2020-07-08T10:24:22.6195117Z', 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' + 'Wed, 08 Jul 2020 10:24:21 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/container159210827181806334/blob159210827183307824') - .reply(202, "", [ - 'Content-Length', - '0', - 'Server', - 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', - 'x-ms-request-id', - 'c1308dd9-201e-003e-4502-42dadf000000', - 'x-ms-client-request-id', - '9e9341b1-24c2-425f-8bda-c179db620409', - 'x-ms-version', - '2019-12-12', - 'x-ms-delete-type-permanent', - 'false', - 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' -]); - -nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .put('/container159210827181806334/blob159210827183307824') + .put('/container159420386126901694/pageBlobName159420386292509625') .reply(201, "", [ 'Content-Length', '0', 'Last-Modified', - 'Sun, 14 Jun 2020 04:17:51 GMT', + 'Wed, 08 Jul 2020 10:24:22 GMT', 'ETag', - '"0x8D81019E7993C75"', + '"0x8D823291534552F"', 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c1308de0-201e-003e-4c02-42dadf000000', + 'b197f9fc-001e-0006-1211-55c1d9000000', 'x-ms-client-request-id', - '129379be-57e4-472e-be4b-afc5e9aa5db3', + '5afdc1b9-3531-4672-bde2-f119ca8b6e30', 'x-ms-version', '2019-12-12', 'x-ms-request-server-encrypted', 'true', 'x-ms-version-id', - '2020-06-14T04:17:51.8731381Z', + '2020-07-08T10:24:22.9307695Z', 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' + 'Wed, 08 Jul 2020 10:24:21 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .get('/container159210827181806334/blob159210827183307824') + .get('/container159420386126901694/pageBlobName159420386292509625') .query(true) .reply(200, "\ntag1val1tag2val2", [ 'Content-Length', @@ -110,17 +91,17 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c1308de8-201e-003e-5202-42dadf000000', + 'b197fafb-001e-0006-7611-55c1d9000000', 'x-ms-version', '2019-12-12', 'x-ms-client-request-id', - 'ad802a37-d03d-44a0-a30b-2d6308ffa149', + '8f23b2ec-2a74-4b68-8ba7-8aa7ff374d55', 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' + 'Wed, 08 Jul 2020 10:24:22 GMT' ]); nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParams":true}) - .delete('/container159210827181806334') + .delete('/container159420386126901694') .query(true) .reply(202, "", [ 'Content-Length', @@ -128,11 +109,11 @@ nock('https://fakestorageaccount.blob.core.windows.net:443', {"encodedQueryParam 'Server', 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0', 'x-ms-request-id', - 'c1308def-201e-003e-5802-42dadf000000', + 'b197fbaf-001e-0006-0b11-55c1d9000000', 'x-ms-client-request-id', - '7d650c87-5a08-41d3-bbe1-c935a405c1b7', + '824449c6-5efc-4b24-abf5-ce3f7d79feba', 'x-ms-version', '2019-12-12', 'Date', - 'Sun, 14 Jun 2020 04:17:50 GMT' + 'Wed, 08 Jul 2020 10:24:22 GMT' ]); diff --git a/sdk/storage/storage-blob/test/blobclient.spec.ts b/sdk/storage/storage-blob/test/blobclient.spec.ts index 77769bd42360..6111c6d54917 100644 --- a/sdk/storage/storage-blob/test/blobclient.spec.ts +++ b/sdk/storage/storage-blob/test/blobclient.spec.ts @@ -144,14 +144,14 @@ describe("BlobClient", () => { this.skip(); } - await blockBlobClient.delete(); - const tags = { tag1: "val1", tag2: "val2" }; - const pageBlobClient = blobClient.getPageBlobClient(); + const pageBlobName = recorder.getUniqueName("pageBlobName"); + const blobClient2 = containerClient.getBlobClient(pageBlobName); + const pageBlobClient = blobClient2.getPageBlobClient(); await pageBlobClient.create(512, { tags }); const response = await pageBlobClient.getTags();