From 561d522ac0828c1e7e4c8c912521214a2227a3d1 Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Thu, 30 Sep 2021 11:48:12 -0700 Subject: [PATCH] reenable tests (#20978) --- .../ai/formrecognizer/_form_base_client.py | 2 ++ .../aio/_form_base_client_async.py | 2 ++ ...est_receipt.test_receipt_locale_error.yaml | 22 ++++++++-------- ...ceipt_async.test_receipt_locale_error.yaml | 22 ++++++++-------- ...pt_from_url.test_receipt_locale_error.yaml | 24 ++++++++--------- ...m_url_async.test_receipt_locale_error.yaml | 24 ++++++++--------- .../tests/test_logging.py | 24 ++++++++--------- .../tests/test_logging_async.py | 26 +++++++++---------- .../tests/test_mgmt.py | 1 - .../tests/test_mgmt_async.py | 1 - .../tests/test_receipt.py | 3 +-- .../tests/test_receipt_async.py | 3 +-- .../tests/test_receipt_from_url.py | 4 +-- .../tests/test_receipt_from_url_async.py | 4 +-- 14 files changed, 79 insertions(+), 83 deletions(-) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py index 037e8e8c6c98..ce37f74b2a34 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/_form_base_client.py @@ -56,6 +56,8 @@ def __init__(self, endpoint, credential, **kwargs): "op", "pages", "readingOrder", + "stringIndexType", + "api-version" } ) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py index 1e3b22effa3e..6468e6bb5665 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/azure/ai/formrecognizer/aio/_form_base_client_async.py @@ -67,6 +67,8 @@ def __init__( "op", "pages", "readingOrder", + "stringIndexType", + "api-version" } ) self._client = FormRecognizer( diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt.test_receipt_locale_error.yaml b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt.test_receipt_locale_error.yaml index 27d57ee0e053..dc3ad49cd758 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt.test_receipt_locale_error.yaml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt.test_receipt_locale_error.yaml @@ -12,31 +12,31 @@ interactions: Content-Length: - '154512' Content-Type: - - image/jpeg + - application/octet-stream User-Agent: - - azsdk-python-ai-formrecognizer/3.2.0b1 Python/3.9.1 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-formrecognizer/3.2.0b1 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST - uri: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + uri: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview response: body: - string: '{"error": {"code": "UnsupportedLocale", "innerError": {"requestId": - "c6836b61-db64-4355-8b25-e1948f564d44"}, "message": "Locale unsupported. Supported - locales include en-AU, en-CA, en-GB, en-IN and en-US."}}' + string: '{"error": {"code": "InvalidArgument", "message": "Invalid argument.", + "innererror": {"code": "InvalidParameter", "message": "The parameter Locale + is invalid: The language code is invalid or not supported."}}}' headers: apim-request-id: - - c6836b61-db64-4355-8b25-e1948f564d44 - content-length: - - '200' + - edf133b9-e46e-458e-a38e-3a148a6ed1f2 content-type: - application/json; charset=utf-8 date: - - Mon, 30 Aug 2021 23:48:59 GMT + - Thu, 30 Sep 2021 17:06:02 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload + transfer-encoding: + - chunked x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '113' + - '135' status: code: 400 message: Bad Request diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_async.test_receipt_locale_error.yaml b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_async.test_receipt_locale_error.yaml index 64cdcdc65abf..93331c0b1c52 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_async.test_receipt_locale_error.yaml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_async.test_receipt_locale_error.yaml @@ -6,26 +6,26 @@ interactions: Accept: - application/json Content-Type: - - image/jpeg + - application/octet-stream User-Agent: - - azsdk-python-ai-formrecognizer/3.1.0 Python/3.9.0 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-formrecognizer/3.2.0b1 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST - uri: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + uri: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview response: body: - string: '{"error": {"code": "UnsupportedLocale", "innerError": {"requestId": - "4c27b38d-d0e4-4b41-b76a-0422a7b924b9"}, "message": "Locale unsupported. Supported - locales include en-AU, en-CA, en-GB, en-IN and en-US."}}' + string: '{"error": {"code": "InvalidArgument", "message": "Invalid argument.", + "innererror": {"code": "InvalidParameter", "message": "The parameter Locale + is invalid: The language code is invalid or not supported."}}}' headers: - apim-request-id: 4c27b38d-d0e4-4b41-b76a-0422a7b924b9 - content-length: '200' + apim-request-id: 8f6bc0ec-dfbe-4d03-895f-b0cf4bec6192 content-type: application/json; charset=utf-8 - date: Tue, 11 May 2021 03:08:08 GMT + date: Thu, 30 Sep 2021 17:06:19 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload + transfer-encoding: chunked x-content-type-options: nosniff - x-envoy-upstream-service-time: '134' + x-envoy-upstream-service-time: '69' status: code: 400 message: Bad Request - url: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + url: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview version: 1 diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url.test_receipt_locale_error.yaml b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url.test_receipt_locale_error.yaml index 8ed6afb3dcc7..36a7cee92635 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url.test_receipt_locale_error.yaml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url.test_receipt_locale_error.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: 'b''{"source": "blob_sas_url"}''' + body: 'b''{"urlSource": "blob_sas_url"}''' headers: Accept: - application/json @@ -9,33 +9,33 @@ interactions: Connection: - keep-alive Content-Length: - - '221' + - '224' Content-Type: - application/json User-Agent: - - azsdk-python-ai-formrecognizer/3.1.0 Python/3.9.0 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-formrecognizer/3.2.0b1 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST - uri: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + uri: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview response: body: - string: '{"error": {"code": "UnsupportedLocale", "innerError": {"requestId": - "04a5530c-7246-4327-9661-6579f4ac252b"}, "message": "Locale unsupported. Supported - locales include en-AU, en-CA, en-GB, en-IN and en-US."}}' + string: '{"error": {"code": "InvalidArgument", "message": "Invalid argument.", + "innererror": {"code": "InvalidParameter", "message": "The parameter Locale + is invalid: The language code is invalid or not supported."}}}' headers: apim-request-id: - - 04a5530c-7246-4327-9661-6579f4ac252b - content-length: - - '200' + - 37eba60a-f330-4c8f-94cf-8747ba3c2fc5 content-type: - application/json; charset=utf-8 date: - - Tue, 11 May 2021 03:09:31 GMT + - Thu, 30 Sep 2021 17:05:04 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload + transfer-encoding: + - chunked x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '289' + - '564' status: code: 400 message: Bad Request diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url_async.test_receipt_locale_error.yaml b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url_async.test_receipt_locale_error.yaml index 1fbd527eb3f5..7da46986f3da 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url_async.test_receipt_locale_error.yaml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/recordings/test_receipt_from_url_async.test_receipt_locale_error.yaml @@ -1,32 +1,32 @@ interactions: - request: - body: 'b''{"source": "blob_sas_url"}''' + body: 'b''{"urlSource": "blob_sas_url"}''' headers: Accept: - application/json Content-Length: - - '221' + - '224' Content-Type: - application/json User-Agent: - - azsdk-python-ai-formrecognizer/3.1.0 Python/3.9.0 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-formrecognizer/3.2.0b1 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST - uri: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + uri: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview response: body: - string: '{"error": {"code": "UnsupportedLocale", "innerError": {"requestId": - "c72b100e-f260-4bd3-874f-3354e1b08e83"}, "message": "Locale unsupported. Supported - locales include en-AU, en-CA, en-GB, en-IN and en-US."}}' + string: '{"error": {"code": "InvalidArgument", "message": "Invalid argument.", + "innererror": {"code": "InvalidParameter", "message": "The parameter Locale + is invalid: The language code is invalid or not supported."}}}' headers: - apim-request-id: c72b100e-f260-4bd3-874f-3354e1b08e83 - content-length: '200' + apim-request-id: e6c4d122-9c19-4bfb-9d69-f5914cfc29b4 content-type: application/json; charset=utf-8 - date: Tue, 11 May 2021 03:12:51 GMT + date: Thu, 30 Sep 2021 17:06:34 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload + transfer-encoding: chunked x-content-type-options: nosniff - x-envoy-upstream-service-time: '897' + x-envoy-upstream-service-time: '581' status: code: 400 message: Bad Request - url: https://region.api.cognitive.microsoft.com/formrecognizer/v2.1/prebuilt/receipt/analyze?includeTextDetails=false&locale=not%20a%20locale + url: https://region.api.cognitive.microsoft.com/formrecognizer/documentModels/prebuilt-receipt:analyze?locale=not%20a%20locale&stringIndexType=unicodeCodePoint&api-version=2021-09-30-preview version: 1 diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py index 0f298dd2a1a5..081b719554c8 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py @@ -13,7 +13,7 @@ except ImportError: # python < 3.3 import mock # type: ignore -from azure.ai.formrecognizer import FormRecognizerClient, FormTrainingClient +from azure.ai.formrecognizer import DocumentAnalysisClient, DocumentModelAdministrationClient from azure.core.credentials import AzureKeyCredential from azure.core.exceptions import HttpResponseError from testcase import FormRecognizerTest @@ -27,20 +27,20 @@ def __init__(self): def emit(self, record): self.messages.append(record) -@pytest.mark.skip + class TestLogging(FormRecognizerTest): @FormRecognizerPreparer() @pytest.mark.live_test_only - def test_logging_info_fr_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) + def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() logger = logging.getLogger("azure") logger.addHandler(mock_handler) logger.setLevel(logging.INFO) - poller = client.begin_recognize_invoices_from_url(self.receipt_url_jpg) + poller = client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) result = poller.result() for message in mock_handler.messages: @@ -53,15 +53,15 @@ def test_logging_info_fr_client(self, formrecognizer_test_endpoint, formrecogniz @FormRecognizerPreparer() @pytest.mark.live_test_only - def test_logging_info_ft_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): - client = FormTrainingClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) + def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() logger = logging.getLogger("azure") logger.addHandler(mock_handler) logger.setLevel(logging.INFO) - result = client.get_account_properties() + result = client.get_account_info() for message in mock_handler.messages: if message.levelname == "INFO": @@ -86,10 +86,10 @@ def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formrecogni response.content_type = "application/json" transport = mock.Mock(send=lambda request, **kwargs: response) - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) with pytest.raises(HttpResponseError) as e: - poller = client.begin_recognize_receipts_from_url(self.receipt_url_jpg) + poller = client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) assert e.value.status_code == 403 assert e.value.error.message == 'Out of call volume quota for FormRecognizer F0 pricing tier. Please retry after 1 day. To increase your call volume switch to a paid tier.' @@ -108,9 +108,9 @@ def test_mock_quota_exceeded_429(self, formrecognizer_test_endpoint, formrecogni response.content_type = "application/json" transport = mock.Mock(send=lambda request, **kwargs: response) - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) with pytest.raises(HttpResponseError) as e: - poller = client.begin_recognize_receipts_from_url(self.receipt_url_jpg) + poller = client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) assert e.value.status_code == 429 assert e.value.error.message == 'Out of call volume quota for FormRecognizer F0 pricing tier. Please retry after 1 day. To increase your call volume switch to a paid tier.' diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py index 5d0a0474bbe1..774e53b255f5 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py @@ -15,7 +15,7 @@ from unittest import mock except ImportError: # python < 3.3 import mock # type: ignore -from azure.ai.formrecognizer.aio import FormRecognizerClient, FormTrainingClient +from azure.ai.formrecognizer.aio import DocumentAnalysisClient, DocumentModelAdministrationClient from azure.core.credentials import AzureKeyCredential from azure.core.exceptions import HttpResponseError from preparers import FormRecognizerPreparer @@ -62,20 +62,20 @@ def __init__(self, *args, **kwargs): self.__aenter__ = mock.Mock(return_value=get_completed_future()) self.__aexit__ = mock.Mock(return_value=get_completed_future()) -@pytest.mark.skip + class TestLogging(AsyncFormRecognizerTest): @FormRecognizerPreparer() @pytest.mark.live_test_only - async def test_logging_info_fr_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) + async def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() logger = logging.getLogger("azure") logger.addHandler(mock_handler) logger.setLevel(logging.INFO) async with client: - poller = await client.begin_recognize_invoices_from_url(self.receipt_url_jpg) + poller = await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) result = await poller.result() for message in mock_handler.messages: @@ -88,15 +88,15 @@ async def test_logging_info_fr_client(self, formrecognizer_test_endpoint, formre @FormRecognizerPreparer() @pytest.mark.live_test_only - async def test_logging_info_ft_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): - client = FormTrainingClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) + async def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() logger = logging.getLogger("azure") logger.addHandler(mock_handler) logger.setLevel(logging.INFO) async with client: - result = await client.get_account_properties() + result = await client.get_account_info() for message in mock_handler.messages: if message.levelname == "INFO": @@ -121,10 +121,10 @@ async def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formr response.content_type = "application/json" transport = AsyncMockTransport(send=wrap_in_future(lambda request, **kwargs: response)) - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) with pytest.raises(HttpResponseError) as e: - poller = await client.begin_recognize_receipts_from_url(self.receipt_url_jpg) + poller = await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) assert e.value.status_code == 403 assert e.value.error.message == 'Out of call volume quota for FormRecognizer F0 pricing tier. Please retry after 1 day. To increase your call volume switch to a paid tier.' @@ -142,8 +142,8 @@ async def test_mock_quota_exceeded_429(self, formrecognizer_test_endpoint, formr response.content_type = "application/json" transport = AsyncMockTransport(send=wrap_in_future(lambda request, **kwargs: response)) - client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) + client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key), transport=transport) with pytest.raises(HttpResponseError) as e: - poller = await client.begin_recognize_receipts_from_url(self.receipt_url_jpg) + poller = await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) assert e.value.status_code == 429 - assert e.value.error.message == 'Out of call volume quota for FormRecognizer F0 pricing tier. Please retry after 1 day. To increase your call volume switch to a paid tier.' \ No newline at end of file + assert e.value.error.message == 'Out of call volume quota for FormRecognizer F0 pricing tier. Please retry after 1 day. To increase your call volume switch to a paid tier.' diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt.py index dbd32752e8f6..cbb417410f23 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt.py @@ -27,7 +27,6 @@ class TestManagement(FormRecognizerTest): - @pytest.mark.skip("aad not working in canary") @FormRecognizerPreparer() @pytest.mark.live_test_only def test_active_directory_auth(self): diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt_async.py index c56f1d12c1a9..e4c6301567de 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_mgmt_async.py @@ -29,7 +29,6 @@ class TestManagementAsync(AsyncFormRecognizerTest): - @pytest.mark.skip("no aad yet in private preview") @FormRecognizerPreparer() @pytest.mark.live_test_only async def test_active_directory_auth_async(self): diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt.py index 68e399005f9b..16888d669c22 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt.py @@ -388,13 +388,12 @@ def test_receipt_locale_specified(self, client): @FormRecognizerPreparer() @GlobalClientPreparer() - @pytest.mark.skip("the service is returning a different error code") def test_receipt_locale_error(self, client): with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() with pytest.raises(HttpResponseError) as e: client.begin_analyze_document("prebuilt-receipt", receipt, locale="not a locale") - assert "UnsupportedLocale" == e.value.error.code + assert "InvalidArgument" == e.value.error.code @FormRecognizerPreparer() @GlobalClientPreparerV2(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_async.py index 538432c44bcf..e097572866c2 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_async.py @@ -400,14 +400,13 @@ async def test_receipt_locale_specified(self, client): @FormRecognizerPreparer() @GlobalClientPreparer() - @pytest.mark.skip("the service is returning a different error code") async def test_receipt_locale_error(self, client): with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() with pytest.raises(HttpResponseError) as e: async with client: await client.begin_analyze_document("prebuilt-receipt", receipt, locale="not a locale") - assert "UnsupportedLocale" == e.value.error.code + assert "InvalidArgument" == e.value.error.code @FormRecognizerPreparer() @GlobalClientPreparerV2(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url.py index da50faad515b..072f11882508 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url.py @@ -35,7 +35,6 @@ def test_polling_interval(self, formrecognizer_test_endpoint, formrecognizer_tes self.assertEqual(poller2._polling_method._timeout, 7) # goes back to client default @pytest.mark.live_test_only - @pytest.mark.skip("aad not enabled yet in v2021-07-30") def test_active_directory_auth(self): token = self.generate_oauth_token() endpoint = self.get_oauth_endpoint() @@ -300,11 +299,10 @@ def test_receipt_locale_specified(self, client): @FormRecognizerPreparer() @GlobalClientPreparer() - @pytest.mark.skip("different error code being returned") def test_receipt_locale_error(self, client): with pytest.raises(HttpResponseError) as e: client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg, locale="not a locale") - assert "UnsupportedLocale" == e.value.error.code + assert "InvalidArgument" == e.value.error.code @FormRecognizerPreparer() @GlobalClientPreparerV2(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url_async.py index 14737014a0f0..c26ec7acb7cc 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_receipt_from_url_async.py @@ -39,7 +39,6 @@ async def test_polling_interval(self, formrecognizer_test_endpoint, formrecogniz @pytest.mark.live_test_only @FormRecognizerPreparer() - @pytest.mark.skip("aad not enabled yet in v2021-07-30") async def test_active_directory_auth_async(self): token = self.generate_oauth_token() endpoint = self.get_oauth_endpoint() @@ -333,12 +332,11 @@ async def test_receipt_locale_specified(self, client): @FormRecognizerPreparer() @GlobalClientPreparer() - @pytest.mark.skip("different error code being returned") async def test_receipt_locale_error(self, client): with pytest.raises(HttpResponseError) as e: async with client: await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg, locale="not a locale") - assert "UnsupportedLocale" == e.value.error.code + assert "InvalidArgument" == e.value.error.code @FormRecognizerPreparer() @GlobalClientPreparerV2(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0})