Skip to content

[Storage] Fix flaky test in test_file.py migration #26735

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 3 commits into from
Oct 10, 2022
Merged

[Storage] Fix flaky test in test_file.py migration #26735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0db01a6
Be gone flaky test
vincenttran-msft Oct 10, 2022
6db0a14
Live only tag
vincenttran-msft Oct 10, 2022
d178e02
Default variable empty pop
vincenttran-msft Oct 10, 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
265 changes: 0 additions & 265 deletions ...-storage-file-share/tests/recordings/test_file.pyTestStorageFiletest_abort_copy_file.json
View file
Open in desktop

This file was deleted.

257 changes: 0 additions & 257 deletions ...re/tests/recordings/test_file_async.pyTestStorageFileAsynctest_abort_copy_file_async.json
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-file-share/tests/test_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,16 +1660,16 @@ def test_copy_file_async_private_file_with_sas(self, **kwargs):
actual_data = file_client.download_file().readall()
assert actual_data == data

@pytest.mark.live_test_only
@FileSharePreparer()
@recorded_by_proxy
def test_abort_copy_file(self, **kwargs):
storage_account_name = kwargs.pop("storage_account_name")
storage_account_key = kwargs.pop("storage_account_key")
secondary_storage_account_name = kwargs.pop("secondary_storage_account_name")
secondary_storage_account_key = kwargs.pop("secondary_storage_account_key")

self._setup(storage_account_name, storage_account_key, secondary_storage_account_name, secondary_storage_account_key)
data = b'12345678' * 1024 * 256
data = b'12345678' * 1024 * 1024
self._create_remote_share()
source_file = self._create_remote_file(file_data=data)
sas_token = self.generate_sas(
Expand Down Expand Up @@ -2352,7 +2352,7 @@ def test_sas_access_file(self, **kwargs):
def test_sas_signed_identifier(self, **kwargs):
storage_account_name = kwargs.pop("storage_account_name")
storage_account_key = kwargs.pop("storage_account_key")
variables = kwargs.pop("variables")
variables = kwargs.pop('variables', {})

self._setup(storage_account_name, storage_account_key)
file_client = self._create_file()
Expand Down
6 changes: 3 additions & 3 deletions sdk/storage/azure-storage-file-share/tests/test_file_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,16 +1685,16 @@ async def test_copy_file_async_private_file_with_sas_async(self, **kwargs):
actual_data = await content.readall()
assert actual_data == data

@pytest.mark.live_test_only
@FileSharePreparer()
@recorded_by_proxy_async
async def test_abort_copy_file_async(self, **kwargs):
storage_account_name = kwargs.pop("storage_account_name")
storage_account_key = kwargs.pop("storage_account_key")
secondary_storage_account_name = kwargs.pop("secondary_storage_account_name")
secondary_storage_account_key = kwargs.pop("secondary_storage_account_key")

self._setup(storage_account_name, storage_account_key, secondary_storage_account_name, secondary_storage_account_key)
data = b'12345678' * 1024 * 256
data = b'12345678' * 1024 * 1024
await self._setup_share(storage_account_name, storage_account_key)
await self._create_remote_share()
source_file = await self._create_remote_file(file_data=data)
Expand Down Expand Up @@ -2406,7 +2406,7 @@ async def test_sas_access_file(self, **kwargs):
async def test_sas_signed_identifier(self, **kwargs):
storage_account_name = kwargs.pop("storage_account_name")
storage_account_key = kwargs.pop("storage_account_key")
variables = kwargs.pop("variables")
variables = kwargs.pop('variables', {})

self._setup(storage_account_name, storage_account_key)
file_client = await self._create_file(storage_account_name, storage_account_key)
Expand Down