Skip to content

[Storage] Fix failing pipeline tests (test_share.py) + name_starts_with async bug fix #26793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vincenttran-msft merged 4 commits into from
Oct 17, 2022
Merged

[Storage] Fix failing pipeline tests (test_share.py) + name_starts_with async bug fix #26793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77a0a00
Add playback only tag to failing live tests
vincenttran-msft Oct 13, 2022
3283f25
Refactored to hopefully get rid of conflicts
vincenttran-msft Oct 13, 2022
7747f75
Tests should pass now, fix prefix bug
vincenttran-msft Oct 14, 2022
ba671f1
Re-record test to fix CI
vincenttran-msft Oct 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-share/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Breaking Changes

### Bugs Fixed
- Fixed an issue where keyword `name_starts_with` was not being passed to the service properly for the `list_shares` async API

### Other Changes
- Added `typing-extensions>=4.0.1` as a dependency.
Expand Down
1 change: 1 addition & 0 deletions sdk/storage/azure-storage-file-share/azure/storage/fileshare/aio/_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ async def _get_next_cb(self, continuation_token):
return await self._command(
marker=continuation_token or None,
maxresults=self.results_per_page,
prefix=self.prefix,
cls=return_context_and_deserialized,
use_location=self.location_mode)
except HttpResponseError as error:
Expand Down
6 changes: 3 additions & 3 deletions ...orage/azure-storage-file-share/azure/storage/fileshare/aio/_share_service_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ def list_shares(
"""
timeout = kwargs.pop('timeout', None)
include = []
include_deleted = kwargs.pop('include_deleted', None)
if include_deleted:
include.append("deleted")
if include_metadata:
include.append('metadata')
if include_snapshots:
include.append('snapshots')
include_deleted = kwargs.pop('include_deleted', None)
if include_deleted:
include.append("deleted")

results_per_page = kwargs.pop('results_per_page', None)
command = functools.partial(
Expand Down
290 changes: 18 additions & 272 deletions ...tests/recordings/test_share.pyTestStorageSharetest_list_shares_with_include_metadata.json
View file
Open in desktop

Large diffs are not rendered by default.

333 changes: 53 additions & 280 deletions ...recordings/test_share.pyTestStorageSharetest_list_shares_with_num_results_and_marker.json
View file
Open in desktop

Large diffs are not rendered by default.

93 changes: 74 additions & 19 deletions ...ile-share/tests/recordings/test_share.pyTestStorageSharetest_list_shares_with_prefix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
{
"Entries": [
{
"RequestUri": "https://storagename.file.core.windows.net/share6b262aeb?restype=share",
"RequestUri": "https://storagename.file.core.windows.net/othershare6b262aeb?restype=share",
"RequestMethod": "PUT",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-file-share/12.10.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Sat, 08 Oct 2022 00:01:42 GMT",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:36 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 201,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Sat, 08 Oct 2022 00:01:43 GMT",
"ETag": "\u00220x8DAA8C04933339E\u0022",
"Last-Modified": "Sat, 08 Oct 2022 00:01:44 GMT",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"ETag": "\u00220x8DAAE339344996C\u0022",
"Last-Modified": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
Expand All @@ -28,29 +28,57 @@
"ResponseBody": null
},
{
"RequestUri": "https://storagename.file.core.windows.net/?comp=list\u0026prefix=share6b262aeb\u0026include=",
"RequestUri": "https://storagename.file.core.windows.net/random26b262aeb?restype=share",
"RequestMethod": "PUT",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:37 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 201,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"ETag": "\u00220x8DAAE339357F78B\u0022",
"Last-Modified": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-version": "2021-06-08"
},
"ResponseBody": null
},
{
"RequestUri": "https://storagename.file.core.windows.net/?comp=list\u0026prefix=random26b262aeb\u0026include=",
"RequestMethod": "GET",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-storage-file-share/12.10.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Sat, 08 Oct 2022 00:01:43 GMT",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:37 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Sat, 08 Oct 2022 00:01:43 GMT",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"Vary": "Origin",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://storagename.file.core.windows.net/\u0022\u003E\u003CPrefix\u003Eshare6b262aeb\u003C/Prefix\u003E\u003CShares\u003E\u003CShare\u003E\u003CName\u003Eshare6b262aeb\u003C/Name\u003E\u003CProperties\u003E\u003CLast-Modified\u003ESat, 08 Oct 2022 00:01:44 GMT\u003C/Last-Modified\u003E\u003CEtag\u003E\u00220x8DAA8C04933339E\u0022\u003C/Etag\u003E\u003CLeaseStatus\u003Eunlocked\u003C/LeaseStatus\u003E\u003CLeaseState\u003Eavailable\u003C/LeaseState\u003E\u003CQuota\u003E5120\u003C/Quota\u003E\u003CAccessTier\u003ETransactionOptimized\u003C/AccessTier\u003E\u003CAccessTierChangeTime\u003ESat, 08 Oct 2022 00:01:44 GMT\u003C/AccessTierChangeTime\u003E\u003CDefaultEncryptionScope\u003E$account-encryption-key\u003C/DefaultEncryptionScope\u003E\u003CDenyEncryptionScopeOverride\u003Efalse\u003C/DenyEncryptionScopeOverride\u003E\u003C/Properties\u003E\u003C/Share\u003E\u003C/Shares\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E"
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://storagename.file.core.windows.net/\u0022\u003E\u003CPrefix\u003Erandom26b262aeb\u003C/Prefix\u003E\u003CShares\u003E\u003CShare\u003E\u003CName\u003Erandom26b262aeb\u003C/Name\u003E\u003CProperties\u003E\u003CLast-Modified\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/Last-Modified\u003E\u003CEtag\u003E\u00220x8DAAE339357F78B\u0022\u003C/Etag\u003E\u003CLeaseStatus\u003Eunlocked\u003C/LeaseStatus\u003E\u003CLeaseState\u003Eavailable\u003C/LeaseState\u003E\u003CQuota\u003E5120\u003C/Quota\u003E\u003CAccessTier\u003ETransactionOptimized\u003C/AccessTier\u003E\u003CAccessTierChangeTime\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/AccessTierChangeTime\u003E\u003CDefaultEncryptionScope\u003E$account-encryption-key\u003C/DefaultEncryptionScope\u003E\u003CDenyEncryptionScopeOverride\u003Efalse\u003C/DenyEncryptionScopeOverride\u003E\u003C/Properties\u003E\u003C/Share\u003E\u003C/Shares\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E"
},
{
"RequestUri": "https://storagename.file.core.windows.net/?comp=list\u0026include=snapshots",
Expand All @@ -59,42 +87,69 @@
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"User-Agent": "azsdk-python-storage-file-share/12.10.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Sat, 08 Oct 2022 00:01:43 GMT",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:37 GMT",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 200,
"ResponseHeaders": {
"Content-Type": "application/xml",
"Date": "Sat, 08 Oct 2022 00:01:43 GMT",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
],
"Transfer-Encoding": "chunked",
"Vary": "Origin",
"x-ms-version": "2021-06-08"
},
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://storagename.file.core.windows.net/\u0022\u003E\u003CShares\u003E\u003CShare\u003E\u003CName\u003Eshare6b262aeb\u003C/Name\u003E\u003CProperties\u003E\u003CLast-Modified\u003ESat, 08 Oct 2022 00:01:44 GMT\u003C/Last-Modified\u003E\u003CEtag\u003E\u00220x8DAA8C04933339E\u0022\u003C/Etag\u003E\u003CLeaseStatus\u003Eunlocked\u003C/LeaseStatus\u003E\u003CLeaseState\u003Eavailable\u003C/LeaseState\u003E\u003CQuota\u003E5120\u003C/Quota\u003E\u003CAccessTier\u003ETransactionOptimized\u003C/AccessTier\u003E\u003CAccessTierChangeTime\u003ESat, 08 Oct 2022 00:01:44 GMT\u003C/AccessTierChangeTime\u003E\u003CDefaultEncryptionScope\u003E$account-encryption-key\u003C/DefaultEncryptionScope\u003E\u003CDenyEncryptionScopeOverride\u003Efalse\u003C/DenyEncryptionScopeOverride\u003E\u003C/Properties\u003E\u003C/Share\u003E\u003C/Shares\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E"
"ResponseBody": "\uFEFF\u003C?xml version=\u00221.0\u0022 encoding=\u0022utf-8\u0022?\u003E\u003CEnumerationResults ServiceEndpoint=\u0022https://storagename.file.core.windows.net/\u0022\u003E\u003CShares\u003E\u003CShare\u003E\u003CName\u003Eothershare6b262aeb\u003C/Name\u003E\u003CProperties\u003E\u003CLast-Modified\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/Last-Modified\u003E\u003CEtag\u003E\u00220x8DAAE339344996C\u0022\u003C/Etag\u003E\u003CLeaseStatus\u003Eunlocked\u003C/LeaseStatus\u003E\u003CLeaseState\u003Eavailable\u003C/LeaseState\u003E\u003CQuota\u003E5120\u003C/Quota\u003E\u003CAccessTier\u003ETransactionOptimized\u003C/AccessTier\u003E\u003CAccessTierChangeTime\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/AccessTierChangeTime\u003E\u003CDefaultEncryptionScope\u003E$account-encryption-key\u003C/DefaultEncryptionScope\u003E\u003CDenyEncryptionScopeOverride\u003Efalse\u003C/DenyEncryptionScopeOverride\u003E\u003C/Properties\u003E\u003C/Share\u003E\u003CShare\u003E\u003CName\u003Erandom26b262aeb\u003C/Name\u003E\u003CProperties\u003E\u003CLast-Modified\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/Last-Modified\u003E\u003CEtag\u003E\u00220x8DAAE339357F78B\u0022\u003C/Etag\u003E\u003CLeaseStatus\u003Eunlocked\u003C/LeaseStatus\u003E\u003CLeaseState\u003Eavailable\u003C/LeaseState\u003E\u003CQuota\u003E5120\u003C/Quota\u003E\u003CAccessTier\u003ETransactionOptimized\u003C/AccessTier\u003E\u003CAccessTierChangeTime\u003EFri, 14 Oct 2022 22:29:36 GMT\u003C/AccessTierChangeTime\u003E\u003CDefaultEncryptionScope\u003E$account-encryption-key\u003C/DefaultEncryptionScope\u003E\u003CDenyEncryptionScopeOverride\u003Efalse\u003C/DenyEncryptionScopeOverride\u003E\u003C/Properties\u003E\u003C/Share\u003E\u003C/Shares\u003E\u003CNextMarker /\u003E\u003C/EnumerationResults\u003E"
},
{
"RequestUri": "https://storagename.file.core.windows.net/othershare6b262aeb?restype=share",
"RequestMethod": "DELETE",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:37 GMT",
"x-ms-delete-snapshots": "include",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 202,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
],
"x-ms-version": "2021-06-08"
},
"ResponseBody": null
},
{
"RequestUri": "https://storagename.file.core.windows.net/share6b262aeb?restype=share",
"RequestUri": "https://storagename.file.core.windows.net/random26b262aeb?restype=share",
"RequestMethod": "DELETE",
"RequestHeaders": {
"Accept": "application/xml",
"Accept-Encoding": "gzip, deflate",
"Connection": "keep-alive",
"Content-Length": "0",
"User-Agent": "azsdk-python-storage-file-share/12.10.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Sat, 08 Oct 2022 00:01:43 GMT",
"User-Agent": "azsdk-python-storage-file-share/12.10.1 Python/3.10.2 (Windows-10-10.0.19044-SP0)",
"x-ms-date": "Fri, 14 Oct 2022 22:29:37 GMT",
"x-ms-delete-snapshots": "include",
"x-ms-version": "2021-06-08"
},
"RequestBody": null,
"StatusCode": 202,
"ResponseHeaders": {
"Content-Length": "0",
"Date": "Sat, 08 Oct 2022 00:01:43 GMT",
"Date": "Fri, 14 Oct 2022 22:29:36 GMT",
"Server": [
"Windows-Azure-File/1.0",
"Microsoft-HTTPAPI/2.0"
Expand Down
Loading