[Storage] Fix 100 Live Tests (#44108)

Author: weirongw23-msft

sdk/storage/azure-storage-blob/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/storage/azure-storage-blob",
-  "Tag": "python/storage/azure-storage-blob_c54a27449c"
+  "Tag": "python/storage/azure-storage-blob_5a54b5cd9f"
 }

sdk/storage/azure-storage-blob/tests/test_blob_tags.py

@@ -529,19 +529,19 @@ def test_set_blob_tags_using_blob_sas(self, **kwargs):
     def test_blob_tags_conditional_headers(self, **kwargs):
         storage_account_name = kwargs.pop("storage_account_name")
         storage_account_key = kwargs.pop("storage_account_key")
-        variables = kwargs.pop("variables", {})
 
         self._setup(storage_account_name, storage_account_key)
 
         blob_name = self._get_blob_reference()
         blob = self.bsc.get_blob_client(self.container_name, blob_name)
         first_resp = blob.upload_blob(b"abc123", overwrite=True)
-        early = self.get_datetime_variable(
-            variables, 'expiry_time', datetime.utcnow()
-        )
+        early = blob.get_blob_properties().last_modified
         first_tags = {"tag1": "firsttag", "tag2": "secondtag", "tag3": "thirdtag"}
         second_tags = {"tag4": "fourthtag", "tag5": "fifthtag", "tag6": "sixthtag"}
 
+        if self.is_live:
+            sleep(10)
+
         with pytest.raises(ResourceModifiedError):
             blob.set_blob_tags(first_tags, if_modified_since=early)
         with pytest.raises(ResourceModifiedError):
@@ -574,6 +574,4 @@ def test_blob_tags_conditional_headers(self, **kwargs):
         tags = blob.get_blob_tags(etag=first_resp['etag'], match_condition=MatchConditions.IfModified)
         assert tags == second_tags
 
-        return variables
-
 #------------------------------------------------------------------------------

sdk/storage/azure-storage-blob/tests/test_blob_tags_async.py

@@ -440,19 +440,19 @@ async def test_filter_blobs(self, **kwargs):
     async def test_blob_tags_conditional_headers(self, **kwargs):
         storage_account_name = kwargs.pop("storage_account_name")
         storage_account_key = kwargs.pop("storage_account_key")
-        variables = kwargs.pop("variables", {})
 
         await self._setup(storage_account_name, storage_account_key)
 
         blob_name = self._get_blob_reference()
         blob = self.bsc.get_blob_client(self.container_name, blob_name)
         first_resp = await blob.upload_blob(b"abc123", overwrite=True)
-        early = self.get_datetime_variable(
-            variables, 'expiry_time', datetime.utcnow()
-        )
+        early = (await blob.get_blob_properties()).last_modified
         first_tags = {"tag1": "firsttag", "tag2": "secondtag", "tag3": "thirdtag"}
         second_tags = {"tag4": "fourthtag", "tag5": "fifthtag", "tag6": "sixthtag"}
 
+        if self.is_live:
+            sleep(10)
+
         with pytest.raises(ResourceModifiedError):
             await blob.set_blob_tags(first_tags, if_modified_since=early)
         with pytest.raises(ResourceModifiedError):
@@ -485,6 +485,4 @@ async def test_blob_tags_conditional_headers(self, **kwargs):
         tags = await blob.get_blob_tags(etag=first_resp['etag'], match_condition=MatchConditions.IfModified)
         assert tags == second_tags
 
-        return variables
-
 #------------------------------------------------------------------------------

sdk/storage/azure-storage-blob/tests/test_block_blob_async.py

@@ -908,7 +908,10 @@ async def test_put_block_list_with_md5(self, **kwargs):
 
     @BlobPreparer()
     @recorded_by_proxy_async
-    async def test_put_block_list_with_blob_tier_specified(self, storage_account_name, storage_account_key):
+    async def test_put_block_list_with_blob_tier_specified(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         # Arrange
         await self._setup(storage_account_name, storage_account_key)
         blob_name = self._get_blob_reference()
@@ -929,7 +932,10 @@ async def test_put_block_list_with_blob_tier_specified(self, storage_account_nam
 
     @BlobPreparer()
     @recorded_by_proxy_async
-    async def test_put_block_list_with_blob_tier_specified_cold(self, storage_account_name, storage_account_key):
+    async def test_put_block_list_with_blob_tier_specified_cold(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         # Arrange
         await self._setup(storage_account_name, storage_account_key)
         blob_name = self._get_blob_reference()
@@ -1418,7 +1424,10 @@ async def test_create_blob_from_bytes_non_parallel(self, **kwargs):
 
     @BlobPreparer()
     @recorded_by_proxy_async
-    async def test_create_blob_from_bytes_with_blob_tier_specified(self, storage_account_name, storage_account_key):
+    async def test_create_blob_from_bytes_with_blob_tier_specified(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         # Arrange
         await self._setup(storage_account_name, storage_account_key)
         blob_name = self._get_blob_reference()
@@ -1484,7 +1493,10 @@ async def test_create_blob_from_path_non_parallel(self, **kwargs):
 
     @BlobPreparer()
     @recorded_by_proxy_async
-    async def test_upload_blob_from_path_non_parallel_with_standard_blob_tier(self, storage_account_name, storage_account_key):
+    async def test_upload_blob_from_path_non_parallel_with_standard_blob_tier(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         # Arrange
         await self._setup(storage_account_name, storage_account_key)
         blob_name = self._get_blob_reference()

sdk/storage/azure-storage-blob/tests/test_container.py

@@ -2594,8 +2594,10 @@ def test_download_blob_modified(self, **kwargs):
 
     @BlobPreparer()
     @recorded_by_proxy
-    def test_download_blob_in_chunks_where_maxsinglegetsize_not_multiple_of_chunksize(
-            self, storage_account_name, storage_account_key):
+    def test_download_blob_in_chunks_where_maxsinglegetsize_not_multiple_of_chunksize(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         bsc = BlobServiceClient(self.account_url(storage_account_name, "blob"), storage_account_key,
                                 max_single_get_size=1024,
                                 max_chunk_get_size=666)

sdk/storage/azure-storage-blob/tests/test_page_blob_async.py

@@ -2205,7 +2205,10 @@ async def test_blob_tier_copy_blob(self, **kwargs):
 
     @BlobPreparer()
     @recorded_by_proxy_async
-    async def test_download_sparse_page_blob(self, storage_account_name, storage_account_key):
+    async def test_download_sparse_page_blob(self, **kwargs):
+        storage_account_name = kwargs.pop("storage_account_name")
+        storage_account_key = kwargs.pop("storage_account_key")
+
         # Arrange
         bsc = BlobServiceClient(self.account_url(storage_account_name, "blob"), credential=storage_account_key, max_page_size=4 * 1024)
         await self._setup(bsc)

sdk/storage/azure-storage-queue/tests/test_queue.py

@@ -1465,7 +1465,7 @@ def test_get_user_delegation_sas(self, **kwargs):
 
     @pytest.mark.live_test_only
     @QueuePreparer()
-    def test_user_delegation_oid(self, **kwargs):
+    def test_queue_user_delegation_oid(self, **kwargs):
         storage_account_name = kwargs.pop("storage_account_name")
         storage_account_key = kwargs.pop("storage_account_key")
         message = "addedmessage"
@@ -1487,7 +1487,7 @@ def test_user_delegation_oid(self, **kwargs):
             queue.account_name,
             queue.queue_name,
             storage_account_key,
-            permission=QueueSasPermissions(add=True),
+            permission=QueueSasPermissions(add=True, read=True, process=True),
             expiry=expiry,
             user_delegation_key=user_delegation_key,
             user_delegation_oid=user_delegation_oid,
@@ -1497,8 +1497,9 @@ def test_user_delegation_oid(self, **kwargs):
         queue_msg = queue_client.send_message(message)
         assert queue_msg is not None
 
-        result = next(queue.receive_messages())
-        assert message == result.content
+        messages = list(queue_client.receive_messages())
+        assert len(messages) > 0
+        assert message == messages[0].content
 
 
 # ------------------------------------------------------------------------------

sdk/storage/azure-storage-queue/tests/test_queue_async.py

@@ -1483,7 +1483,7 @@ async def test_get_user_delegation_sas(self, **kwargs):
 
     @pytest.mark.live_test_only
     @QueuePreparer()
-    async def test_user_delegation_oid(self, **kwargs):
+    async def test_queue_user_delegation_oid(self, **kwargs):
         storage_account_name = kwargs.pop("storage_account_name")
         storage_account_key = kwargs.pop("storage_account_key")
         message = "addedmessage"
@@ -1505,7 +1505,7 @@ async def test_user_delegation_oid(self, **kwargs):
             queue.account_name,
             queue.queue_name,
             storage_account_key,
-            permission=QueueSasPermissions(add=True),
+            permission=QueueSasPermissions(add=True, read=True, process=True),
             expiry=expiry,
             user_delegation_key=user_delegation_key,
             user_delegation_oid=user_delegation_oid,
@@ -1515,12 +1515,10 @@ async def test_user_delegation_oid(self, **kwargs):
         queue_msg = await queue_client.send_message(message)
         assert queue_msg is not None
 
-        result = anext(queue.receive_messages())
-        assert message == result.content
-
         messages = []
-        async for m in queue.receive_messages():
+        async for m in queue_client.receive_messages():
             messages.append(m)
+        assert len(messages) > 0
         assert message == messages[0].content
 
 

sdk/storage/test-resources.json

@@ -31,6 +31,7 @@
         "fileDataPrivilegedContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/69566ab7-960f-475b-8e7c-b3118f30c6bd')]",
         "contributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]",
         "blobDataOwnerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/b7e6dc6d-f1e8-4753-8033-0f276bb0955b')]",
+        "queueDataContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/974c5e8b-45b9-4653-ba55-5f855dd0fb88')]",
         "primaryAccountName": "[concat('prim', parameters('baseName'))]",
         "secondaryAccountName": "[concat('sec', parameters('baseName'))]",
         "softDeleteAccountName": "[concat('sftdl', parameters('baseName'))]",
@@ -58,6 +59,18 @@
                 "principalId": "[parameters('testApplicationOid')]"
             }
         },
+        {
+            "type": "Microsoft.Authorization/roleAssignments",
+            "apiVersion": "[variables('authorizationApiVersion')]",
+            "name": "[guid(concat('queueDataContributorRoleId', variables('primaryAccountName')))]",
+            "dependsOn": [
+                "[variables('primaryAccountName')]"
+            ],
+            "properties": {
+                "roleDefinitionId": "[variables('queueDataContributorRoleId')]",
+                "principalId": "[parameters('testApplicationOid')]"
+            }
+          },
         {
             "type": "Microsoft.Authorization/roleAssignments",
             "apiVersion": "[variables('authorizationApiVersion')]",