diff --git a/sdk/storage/azure-storage-blob/assets.json b/sdk/storage/azure-storage-blob/assets.json index 9aab4bfc99ba..c42138b47212 100644 --- a/sdk/storage/azure-storage-blob/assets.json +++ b/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_a28cdfc889" } diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_tags.py b/sdk/storage/azure-storage-blob/tests/test_blob_tags.py index a87bc5b30250..62bddaa9ba59 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_tags.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_tags.py @@ -536,9 +536,7 @@ def test_blob_tags_conditional_headers(self, **kwargs): 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 = self.get_datetime_variable(variables, 'early', datetime.utcnow()) first_tags = {"tag1": "firsttag", "tag2": "secondtag", "tag3": "thirdtag"} second_tags = {"tag4": "fourthtag", "tag5": "fifthtag", "tag6": "sixthtag"} diff --git a/sdk/storage/azure-storage-blob/tests/test_blob_tags_async.py b/sdk/storage/azure-storage-blob/tests/test_blob_tags_async.py index 38a531674630..213a49f13cc7 100644 --- a/sdk/storage/azure-storage-blob/tests/test_blob_tags_async.py +++ b/sdk/storage/azure-storage-blob/tests/test_blob_tags_async.py @@ -447,9 +447,7 @@ async def test_blob_tags_conditional_headers(self, **kwargs): 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 = self.get_datetime_variable(variables, 'early', datetime.utcnow()) first_tags = {"tag1": "firsttag", "tag2": "secondtag", "tag3": "thirdtag"} second_tags = {"tag4": "fourthtag", "tag5": "fifthtag", "tag6": "sixthtag"} diff --git a/sdk/storage/azure-storage-queue/tests/test_queue.py b/sdk/storage/azure-storage-queue/tests/test_queue.py index 3f45c8ed5ecd..8eb7b9948113 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue.py +++ b/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,7 +1497,7 @@ 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()) + result = next(queue_client.receive_messages()) assert message == result.content diff --git a/sdk/storage/azure-storage-queue/tests/test_queue_async.py b/sdk/storage/azure-storage-queue/tests/test_queue_async.py index 781ab9bb2b8e..cc414b470300 100644 --- a/sdk/storage/azure-storage-queue/tests/test_queue_async.py +++ b/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 messages is not None assert message == messages[0].content