[Storage] Attempt to fix flaky retry test (Azure#25656)

Author: jalauzon-msft

sdk/storage/azure-storage-blob/tests/recordings/test_retry.test_retry_on_socket_timeout.yaml

@@ -128,19 +128,26 @@ def assert_exception_is_present_on_retry_context(**kwargs):
     def test_retry_on_socket_timeout(self, storage_account_name, storage_account_key):
         # Arrange
         container_name = self.get_resource_name('utcontainer')
-        retry = LinearRetry(backoff=1)
+        blob_name = self.get_resource_name('blob')
+        # Upload a blob that can be downloaded to test read timeout
+        service = self._create_storage_service(BlobServiceClient, storage_account_name, storage_account_key)
+        container = service.create_container(container_name)
+        container.upload_blob(blob_name, b'a' * 5 * 1025, overwrite=True)
+
+        retry = LinearRetry(backoff=1, random_jitter_range=1)
         retry_transport = RetryRequestTransport(connection_timeout=11, read_timeout=0.000000000001)
         # make the connect timeout reasonable, but packet timeout truly small, to make sure the request always times out
         service = self._create_storage_service(
             BlobServiceClient, storage_account_name, storage_account_key, retry_policy=retry, transport=retry_transport)
+        blob = service.get_blob_client(container_name, blob_name)
 
         assert service._client._client._pipeline._transport.connection_config.timeout == 11
         assert service._client._client._pipeline._transport.connection_config.read_timeout == 0.000000000001
 
         # Act
         try:
             with self.assertRaises(AzureError) as error:
-                service.create_container(container_name)
+                blob.download_blob()
             # Assert
             # 3 retries + 1 original == 4
             assert retry_transport.count == 4

sdk/storage/azure-storage-blob/tests/recordings/test_retry_async.test_retry_on_socket_timeout_async.yaml

@@ -146,21 +146,26 @@ def assert_exception_is_present_on_retry_context(**kwargs):
     async def test_retry_on_socket_timeout_async(self, storage_account_name, storage_account_key):
         # Arrange
         container_name = self.get_resource_name('utcontainer')
-        retry = LinearRetry(backoff=1)
+        blob_name = self.get_resource_name('blob')
+        # Upload a blob that can be downloaded to test read timeout
+        service = self._create_storage_service(BlobServiceClient, storage_account_name, storage_account_key)
+        container = await service.create_container(container_name)
+        await container.upload_blob(blob_name, b'a' * 5 * 1025, overwrite=True)
+
+        retry = LinearRetry(backoff=1, random_jitter_range=1)
         retry_transport = AiohttpRetryTestTransport(connection_timeout=11, read_timeout=0.000000000001)
         # make the connect timeout reasonable, but packet timeout truly small, to make sure the request always times out
         service = self._create_storage_service(
             BlobServiceClient, storage_account_name, storage_account_key, retry_policy=retry, transport=retry_transport)
+        blob = service.get_blob_client(container_name, blob_name)
 
         assert service._client._client._pipeline._transport.connection_config.timeout == 11
         assert service._client._client._pipeline._transport.connection_config.read_timeout == 0.000000000001
 
         # Act
         try:
             with self.assertRaises(AzureError) as error:
-                await service.create_container(container_name)
-
-
+                await blob.download_blob()
             # Assert
             # 3 retries + 1 original == 4
             assert retry_transport.count == 4
@@ -172,10 +177,7 @@ async def test_retry_on_socket_timeout_async(self, storage_account_name, storage
 
         finally:
             # we must make the timeout normal again to let the delete operation succeed
-            try:
-                await service.delete_container(container_name, connection_timeout=11)
-            except:
-                pass
+            await service.delete_container(container_name, connection_timeout=11, read_timeout=11)
 
     @BlobPreparer()
     @AsyncStorageTestCase.await_prepared_test