[Storage] Another fix to flaky retry test (Azure#25940)

mccoyp · Sep 22, 2022 · 7565cca · 7565cca
1 parent 297bd17
commit 7565cca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sdk/storage/azure-storage-blob/tests/test_retry.py b/sdk/storage/azure-storage-blob/tests/test_retry.py
@@ -167,8 +167,9 @@ def test_retry_on_socket_timeout(self, **kwargs):
             assert 'read timeout' in str(error.value.args[0]), 'Expected socket timeout but got different exception.'
 
         finally:
-            # we must make the timeout normal again to let the delete operation succeed
-            service.delete_container(container_name, connection_timeout=(11, 11))
+            # Recreate client with normal timeouts
+            service = self._create_storage_service(BlobServiceClient, storage_account_name, storage_account_key)
+            service.delete_container(container_name)
 
     @BlobPreparer()
     @recorded_by_proxy

diff --git a/sdk/storage/azure-storage-blob/tests/test_retry_async.py b/sdk/storage/azure-storage-blob/tests/test_retry_async.py
@@ -165,8 +165,9 @@ async def test_retry_on_socket_timeout(self, **kwargs):
             assert 'Timeout on reading data from socket' in str(error.value.args[0]), 'Expected socket timeout but got different exception.'
 
         finally:
-            # we must make the timeout normal again to let the delete operation succeed
-            await service.delete_container(container_name, connection_timeout=11, read_timeout=11)
+            # Recreate client with normal timeouts
+            service = self._create_storage_service(BlobServiceClient, storage_account_name, storage_account_key)
+            service.delete_container(container_name)
 
     @BlobPreparer()
     @recorded_by_proxy_async