From ab054faaa7d409a436dbff8fa560bfa41c12170b Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Fri, 21 Jan 2022 15:09:00 -0800 Subject: [PATCH] use kwargs where we don't record tests --- .../tests/test_dac_analyze_custom_model.py | 8 +++++-- .../test_dac_analyze_custom_model_async.py | 8 +++++-- .../test_dac_analyze_custom_model_from_url.py | 8 +++++-- ...dac_analyze_custom_model_from_url_async.py | 8 +++++-- .../tests/test_dac_analyze_prebuilts.py | 6 +++-- .../tests/test_dac_analyze_prebuilts_async.py | 6 +++-- .../test_dac_analyze_prebuilts_from_url.py | 3 ++- ...st_dac_analyze_prebuilts_from_url_async.py | 3 ++- .../tests/test_dmac_compose_model.py | 5 ++-- .../tests/test_dmac_compose_model_async.py | 5 ++-- .../tests/test_dmac_copy_model.py | 5 ++-- .../tests/test_dmac_copy_model_async.py | 4 +++- .../tests/test_dmac_mgmt.py | 15 ++++++++---- .../tests/test_dmac_mgmt_async.py | 15 ++++++++---- .../tests/test_dmac_training.py | 5 ++-- .../tests/test_dmac_training_async.py | 4 +++- .../tests/test_frc_business_card.py | 12 ++++++---- .../tests/test_frc_business_card_async.py | 12 ++++++---- .../tests/test_frc_business_card_from_url.py | 3 ++- .../test_frc_business_card_from_url_async.py | 3 ++- .../tests/test_frc_content.py | 12 ++++++---- .../tests/test_frc_content_async.py | 12 ++++++---- .../tests/test_frc_content_from_url.py | 6 +++-- .../tests/test_frc_content_from_url_async.py | 6 +++-- .../tests/test_frc_custom_forms.py | 4 +++- .../tests/test_frc_custom_forms_async.py | 4 +++- .../tests/test_frc_custom_forms_from_url.py | 4 +++- .../test_frc_custom_forms_from_url_async.py | 4 +++- .../tests/test_frc_identity_documents.py | 18 +++++++++----- .../test_frc_identity_documents_async.py | 18 +++++++++----- .../test_frc_identity_documents_from_url.py | 6 +++-- ...t_frc_identity_documents_from_url_async.py | 6 +++-- .../tests/test_frc_invoice.py | 18 +++++++++----- .../tests/test_frc_invoice_async.py | 18 +++++++++----- .../tests/test_frc_invoice_from_url.py | 6 +++-- .../tests/test_frc_invoice_from_url_async.py | 6 +++-- .../tests/test_frc_receipt.py | 15 ++++++++---- .../tests/test_frc_receipt_async.py | 13 ++++++---- .../tests/test_frc_receipt_from_url.py | 3 ++- .../tests/test_frc_receipt_from_url_async.py | 3 ++- .../tests/test_ftc_compose_model.py | 3 ++- .../tests/test_ftc_compose_model_async.py | 3 ++- .../tests/test_ftc_training.py | 3 ++- .../tests/test_ftc_training_async.py | 3 ++- .../tests/test_logging.py | 16 +++++++++---- .../tests/test_logging_async.py | 16 +++++++++---- .../tests/test_multiapi.py | 24 ++++++++++++------- .../tests/test_multiapi_async.py | 24 ++++++++++++------- 48 files changed, 281 insertions(+), 131 deletions(-) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py index 6e248c97c1b0..0a812fa22951 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model.py @@ -20,13 +20,17 @@ class TestDACAnalyzeCustomModel(FormRecognizerTest): @FormRecognizerPreparer() - def test_analyze_document_none_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + def test_analyze_document_none_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): client.begin_analyze_document(model=None, document=b"xx") @FormRecognizerPreparer() - def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + def test_analyze_document_empty_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): client.begin_analyze_document(model="", document=b"xx") diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py index c16b007688f6..2a8cefb9bda1 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_async.py @@ -24,14 +24,18 @@ class TestDACAnalyzeCustomModelAsync(AsyncFormRecognizerTest): @FormRecognizerPreparer() - async def test_analyze_document_none_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + async def test_analyze_document_none_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): async with client: await client.begin_analyze_document(model=None, document=b"xx") @FormRecognizerPreparer() - async def test_analyze_document_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + async def test_analyze_document_empty_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): async with client: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py index 5260a9917190..69a966404409 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url.py @@ -20,13 +20,17 @@ class TestDACAnalyzeCustomModelFromUrl(FormRecognizerTest): @FormRecognizerPreparer() - def test_document_analysis_none_model(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + def test_document_analysis_none_model(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): client.begin_analyze_document_from_url(model=None, document_url="https://badurl.jpg") @FormRecognizerPreparer() - def test_document_analysis_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + def test_document_analysis_empty_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): client.begin_analyze_document_from_url(model="", document_url="https://badurl.jpg") diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py index 426f37ede137..dc14488189dd 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_custom_model_from_url_async.py @@ -22,14 +22,18 @@ class TestDACAnalyzeCustomModelFromUrlAsync(AsyncFormRecognizerTest): @FormRecognizerPreparer() - async def test_document_analysis_none_model(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + async def test_document_analysis_none_model(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): async with client: await client.begin_analyze_document_from_url(model=None, document_url="https://badurl.jpg") @FormRecognizerPreparer() - async def test_document_analysis_empty_model_id(self, formrecognizer_test_endpoint, formrecognizer_test_api_key, **kwargs): + async def test_document_analysis_empty_model_id(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) with pytest.raises(ValueError): async with client: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts.py index 895d93c3bafa..89789915d393 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts.py @@ -217,7 +217,8 @@ def test_invoice_jpg(self, client): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_fail_passing_content_type(self, client): + def test_fail_passing_content_type(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_png, "rb") as fd: myfile = fd.read() with pytest.raises(TypeError): @@ -486,7 +487,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_receipt_continuation_token(self, client): + def test_receipt_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_async.py index 448074bf9c82..9b6e612aa87c 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_async.py @@ -66,7 +66,8 @@ async def test_blank_page(self, client): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - async def test_passing_unsupported_url_content_type(self, client, **kwargs): + async def test_passing_unsupported_url_content_type(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(TypeError): async with client: poller = await client.begin_analyze_document("prebuilt-receipt", "https://badurl.jpg", content_type="application/json") @@ -283,7 +284,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - async def test_receipt_continuation_token(self, client): + async def test_receipt_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url.py index b94dd1c11f63..85b38925ce7d 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url.py @@ -355,7 +355,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_receipt_continuation_token(self, client): + def test_receipt_continuation_token(self, **kwargs): + client = kwargs.pop("client") initial_poller = client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) cont_token = initial_poller.continuation_token() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url_async.py index ace65b489d35..d5d9fde47084 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dac_analyze_prebuilts_from_url_async.py @@ -390,7 +390,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - async def test_receipt_continuation_token(self, client): + async def test_receipt_continuation_token(self, **kwargs): + client = kwargs.pop("client") async with client: initial_poller = await client.begin_analyze_document_from_url("prebuilt-receipt", self.receipt_url_jpg) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py index dfc41db2cfb3..ef563316c9b0 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model.py @@ -84,8 +84,9 @@ def callback(response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_compose_continuation_token(self, client, formrecognizer_storage_container_sas_url): - + def test_compose_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") poller = client.begin_build_model(formrecognizer_storage_container_sas_url) model_1 = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py index 17bb4e678814..c317720ed439 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_compose_model_async.py @@ -87,8 +87,9 @@ def callback(response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_compose_continuation_token(self, client, formrecognizer_storage_container_sas_url): - + async def test_compose_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: poller = await client.begin_build_model(formrecognizer_storage_container_sas_url) model_1 = await poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py index a38fcb0e6e1f..76b8df8cdde8 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model.py @@ -178,8 +178,9 @@ def test_copy_model_with_composed_model(self, client, formrecognizer_storage_con @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() @pytest.mark.skip() - def test_copy_continuation_token(self, client, formrecognizer_storage_container_sas_url): - + def test_copy_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") poller = client.begin_build_model(formrecognizer_storage_container_sas_url) model = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py index 2cb4beb6b7c0..744f3a1ee2f4 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_copy_model_async.py @@ -180,7 +180,9 @@ async def test_copy_model_with_composed_model(self, client, formrecognizer_stora @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() @pytest.mark.skip() - async def test_copy_continuation_token(self, client, formrecognizer_storage_container_sas_url): + async def test_copy_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: poller = await client.begin_build_model(formrecognizer_storage_container_sas_url) model = await poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py index 1181bed1ccb3..ffc15ec6bc84 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt.py @@ -44,25 +44,29 @@ def test_dmac_auth_bad_key(self, formrecognizer_test_endpoint, formrecognizer_te @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_get_model_empty_model_id(self, client): + def test_get_model_empty_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): result = client.get_model("") @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_get_model_none_model_id(self, client): + def test_get_model_none_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): result = client.get_model(None) @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_delete_model_none_model_id(self, client): + def test_delete_model_none_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): result = client.delete_model(None) @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_delete_model_empty_model_id(self, client): + def test_delete_model_empty_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): result = client.delete_model("") @@ -177,7 +181,8 @@ def test_get_list_operations(self, client): @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_get_operation_bad_model_id(self, client): + def test_get_operation_bad_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): client.get_operation("") with pytest.raises(ValueError): diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py index 5a776e1c2bc8..1b6ec892f01c 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_mgmt_async.py @@ -47,28 +47,32 @@ async def test_dmac_auth_bad_key(self, formrecognizer_test_endpoint, formrecogni @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_get_model_empty_model_id(self, client): + async def test_get_model_empty_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): async with client: result = await client.get_model("") @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_get_model_none_model_id(self, client): + async def test_get_model_none_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): async with client: result = await client.get_model(None) @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_delete_model_none_model_id(self, client): + async def test_delete_model_none_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): async with client: result = await client.delete_model(None) @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_delete_model_empty_model_id(self, client): + async def test_delete_model_empty_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): async with client: result = await client.delete_model("") @@ -187,7 +191,8 @@ async def test_get_list_operations(self, client): @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_get_operation_bad_model_id(self, client): + async def test_get_operation_bad_model_id(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError): await client.get_operation("") with pytest.raises(ValueError): diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py index 335c94884964..b109ef9c51ef 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training.py @@ -214,8 +214,9 @@ def test_build_model_azure_blob_path_filter(self, client, formrecognizer_storage @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - def test_build_model_continuation_token(self, client, formrecognizer_storage_container_sas_url): - + def test_build_model_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") initial_poller = client.begin_build_model(formrecognizer_storage_container_sas_url) cont_token = initial_poller.continuation_token() poller = client.begin_build_model(None, continuation_token=cont_token) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py index 8fe2e3b2454b..afb77cd01570 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_dmac_training_async.py @@ -224,7 +224,9 @@ async def test_build_model_azure_blob_path_filter(self, client, formrecognizer_s @pytest.mark.live_test_only @FormRecognizerPreparer() @DocumentModelAdministrationClientPreparer() - async def test_build_model_continuation_token(self, client, formrecognizer_storage_container_sas_url): + async def test_build_model_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") async with client: initial_poller = await client.begin_build_model(formrecognizer_storage_container_sas_url) cont_token = initial_poller.continuation_token() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card.py index 3def3e372046..666d925520d0 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card.py @@ -36,7 +36,8 @@ def test_passing_enum_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_business_cards( @@ -45,7 +46,8 @@ def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_io_fails_autodetect(self, client): + def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_business_cards( @@ -54,7 +56,8 @@ def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_bad_content_type_param_passed(self, client): + def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.business_card_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -181,7 +184,8 @@ def test_business_card_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_business_card_v2(self, client): + def test_business_card_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.business_card_jpg, "rb") as fd: business_card = fd.read() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_async.py index 0ce134dc28ce..55163f7c9601 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_async.py @@ -36,7 +36,8 @@ async def test_passing_enum_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + async def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -46,7 +47,8 @@ async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_io_fails_autodetect(self, client): + async def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -57,7 +59,8 @@ async def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_passing_bad_content_type_param_passed(self, client): + async def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.business_card_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -122,7 +125,8 @@ async def test_business_card_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_business_card_v2(self, client): + async def test_business_card_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.business_card_jpg, "rb") as fd: business_card = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url.py index 2f808d3559a5..b30b8b838834 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url.py @@ -71,7 +71,8 @@ def test_business_card_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_business_card_v2(self, client): + def test_business_card_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: client.begin_recognize_business_cards_from_url(self.business_card_url_jpg) assert "Method 'begin_recognize_business_cards_from_url' is only available for API version V2_1 and up" in str(e.value) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url_async.py index 9e32824fa120..c76f15cb6e06 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_business_card_from_url_async.py @@ -73,7 +73,8 @@ async def test_business_card_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_business_card_v2(self, client): + async def test_business_card_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: async with client: await client.begin_recognize_business_cards_from_url(self.business_card_url_jpg) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content.py index 3cad7f8254a6..ebf87e30b49f 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content.py @@ -64,7 +64,8 @@ def test_damaged_file_passed_as_bytes(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_bad_content_type_param_passed(self, client): + def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -75,7 +76,8 @@ def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_auto_detect_unsupported_stream_content(self, client): + def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -205,7 +207,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_content_continuation_token(self, client): + def test_content_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.form_jpg, "rb") as fd: myfile = fd.read() initial_poller = client.begin_recognize_content(myfile) @@ -317,7 +320,8 @@ def test_content_language_error(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_content_language_v2(self, client): + def test_content_language_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.form_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_async.py index 724a638a113a..197f10e9c1d7 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_async.py @@ -75,7 +75,8 @@ async def test_damaged_file_passed_as_bytes(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_passing_bad_content_type_param_passed(self, client): + async def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -88,7 +89,8 @@ async def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_auto_detect_unsupported_stream_content(self, client): + async def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -219,7 +221,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_content_continuation_token(self, client): + async def test_content_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.form_jpg, "rb") as fd: myfile = fd.read() async with client: @@ -346,7 +349,8 @@ async def test_content_language_specified(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_content_language_v2(self, client): + async def test_content_language_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.form_jpg, "rb") as fd: myfile = fd.read() async with client: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url.py index a099a570586b..b156d8f15e5e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url.py @@ -155,7 +155,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_content_continuation_token(self, client): + def test_content_continuation_token(self, **kwargs): + client = kwargs.pop("client") initial_poller = client.begin_recognize_content_from_url(self.form_url_jpg) cont_token = initial_poller.continuation_token() @@ -266,7 +267,8 @@ def test_content_language_error(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_content_language_v2(self, client): + def test_content_language_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: client.begin_recognize_content_from_url(self.form_url_jpg, language="en") assert "'language' is only available for API version V2_1 and up" in str(e.value) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url_async.py index 0f8ade5dfe8a..cd11b5f467df 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_content_from_url_async.py @@ -125,7 +125,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_content_continuation_token(self, client): + async def test_content_continuation_token(self, **kwargs): + client = kwargs.pop("client") async with client: initial_poller = await client.begin_recognize_content_from_url(self.form_url_jpg) cont_token = initial_poller.continuation_token() @@ -244,7 +245,8 @@ async def test_content_language_error(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_content_language_v2(self, client): + async def test_content_language_v2(self, **kwargs): + client = kwargs.pop("client") async with client: with pytest.raises(ValueError) as e: await client.begin_recognize_content_from_url(self.form_url_jpg, language="en") diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms.py index 62ba39d5cfa5..e51250202117 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms.py @@ -214,7 +214,9 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormTrainingClientPreparer() - def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2, **kwargs): + def test_custom_form_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url_v2 = kwargs.pop("formrecognizer_storage_container_sas_url_v2") fr_client = client.get_form_recognizer_client() poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_async.py index ed632bfbc379..9c696dd8c5ee 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_async.py @@ -145,7 +145,9 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormTrainingClientPreparer() - async def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2, **kwargs): + async def test_custom_form_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url_v2 = kwargs.pop("formrecognizer_storage_container_sas_url_v2") fr_client = client.get_form_recognizer_client() with open(self.form_jpg, "rb") as fd: myfile = fd.read() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url.py index 1fee0781900c..bd576a7a9b45 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url.py @@ -148,7 +148,9 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormTrainingClientPreparer() - def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url_v2, **kwargs): + def test_custom_form_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url_v2 = kwargs.pop("formrecognizer_storage_container_sas_url_v2") fr_client = client.get_form_recognizer_client() training_poller = client.begin_training(formrecognizer_storage_container_sas_url_v2, use_training_labels=False) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url_async.py index c29d521ef102..f45aeeaec883 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_custom_forms_from_url_async.py @@ -158,7 +158,9 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormTrainingClientPreparer() - async def test_custom_form_continuation_token(self, client, formrecognizer_storage_container_sas_url, **kwargs): + async def test_custom_form_continuation_token(self, **kwargs): + client = kwargs.pop("client") + formrecognizer_storage_container_sas_url = kwargs.pop("formrecognizer_storage_container_sas_url") fr_client = client.get_form_recognizer_client() async with client: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents.py index 60fa43208f04..db977fb5b9b1 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents.py @@ -34,7 +34,8 @@ def test_identity_document_bad_endpoint(self, formrecognizer_test_api_key, **kwa @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_identity_documents( @@ -43,7 +44,8 @@ def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_io_fails_autodetect(self, client): + def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_identity_documents( @@ -52,7 +54,8 @@ def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_bad_content_type_param_passed(self, client): + def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -63,7 +66,8 @@ def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_auto_detect_unsupported_stream_content(self, client): + def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -137,7 +141,8 @@ def test_identity_document_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_identity_document_continuation_token(self, client): + def test_identity_document_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: id_document = fd.read() @@ -150,7 +155,8 @@ def test_identity_document_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_identity_document_v2(self, client): + def test_identity_document_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: id_document = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_async.py index c77fca15695e..c1d8bfb558f0 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_async.py @@ -36,7 +36,8 @@ async def test_identity_document_bad_endpoint(self, formrecognizer_test_endpoint @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + async def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -46,7 +47,8 @@ async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_io_fails_autodetect(self, client): + async def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -56,7 +58,8 @@ async def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_passing_bad_content_type_param_passed(self, client): + async def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -68,7 +71,8 @@ async def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_auto_detect_unsupported_stream_content(self, client): + async def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -145,7 +149,8 @@ async def test_identity_document_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_identity_document_continuation_token(self, client): + async def test_identity_document_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: id_document = fd.read() async with client: @@ -158,7 +163,8 @@ async def test_identity_document_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_identity_document_v2(self, client): + async def test_identity_document_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.identity_document_license_jpg, "rb") as fd: id_document = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url.py index de3a245425d9..4c10d6120e81 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url.py @@ -97,7 +97,8 @@ def test_identity_document_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_identity_document_continuation_token(self, client): + def test_identity_document_continuation_token(self, **kwargs): + client = kwargs.pop("client") initial_poller = client.begin_recognize_identity_documents_from_url(self.identity_document_url_jpg) cont_token = initial_poller.continuation_token() poller = client.begin_recognize_identity_documents_from_url(None, continuation_token=cont_token) @@ -107,7 +108,8 @@ def test_identity_document_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_identity_document_v2(self, client): + def test_identity_document_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: client.begin_recognize_identity_documents_from_url(self.identity_document_url_jpg) assert "Method 'begin_recognize_identity_documents_from_url' is only available for API version V2_1 and up" in str(e.value) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url_async.py index 3ec2c2620b7e..91d07ee9884d 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_identity_documents_from_url_async.py @@ -101,7 +101,8 @@ async def test_identity_document_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_identity_document_continuation_token(self, client): + async def test_identity_document_continuation_token(self, **kwargs): + client = kwargs.pop("client") async with client: initial_poller = await client.begin_recognize_identity_documents_from_url(self.identity_document_url_jpg) cont_token = initial_poller.continuation_token() @@ -112,7 +113,8 @@ async def test_identity_document_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_identity_document_v2(self, client): + async def test_identity_document_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: async with client: await client.begin_recognize_identity_documents_from_url(self.identity_document_url_jpg) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice.py index 289c5fab77be..09858b909fd1 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice.py @@ -48,7 +48,8 @@ def test_passing_enum_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_invoices( @@ -57,7 +58,8 @@ def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_io_fails_autodetect(self, client): + def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_invoices( @@ -66,7 +68,8 @@ def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_bad_content_type_param_passed(self, client): + def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -77,7 +80,8 @@ def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_auto_detect_unsupported_stream_content(self, client): + def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -278,7 +282,8 @@ def test_invoice_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_invoice_continuation_token(self, client): + def test_invoice_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_tiff, "rb") as fd: invoice = fd.read() @@ -292,7 +297,8 @@ def test_invoice_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_invoice_v2(self, client): + def test_invoice_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: invoice = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_async.py index ef8d7eeef1d9..23250f918576 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_async.py @@ -52,7 +52,8 @@ async def test_passing_enum_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + async def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -62,7 +63,8 @@ async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_io_fails_autodetect(self, client): + async def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -72,7 +74,8 @@ async def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_passing_bad_content_type_param_passed(self, client): + async def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -84,7 +87,8 @@ async def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_auto_detect_unsupported_stream_content(self, client): + async def test_auto_detect_unsupported_stream_content(self, **kwargs): + client = kwargs.pop("client") with open(self.unsupported_content_py, "rb") as fd: myfile = fd.read() @@ -293,7 +297,8 @@ async def test_invoice_jpg_include_field_elements(self, client): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_invoice_continuation_token(self, client): + async def test_invoice_continuation_token(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_tiff, "rb") as fd: invoice = fd.read() @@ -307,7 +312,8 @@ async def test_invoice_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_invoice_v2(self, client): + async def test_invoice_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.invoice_pdf, "rb") as fd: invoice = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url.py index 0aae71e6565e..f5b8e470625e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url.py @@ -88,7 +88,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_invoice_continuation_token(self, client): + def test_invoice_continuation_token(self, **kwargs): + client = kwargs.pop("client") initial_poller = client.begin_recognize_invoices_from_url(self.invoice_url_tiff) cont_token = initial_poller.continuation_token() @@ -99,7 +100,8 @@ def test_invoice_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_invoice_v2(self, client): + def test_invoice_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: client.begin_recognize_invoices_from_url(self.invoice_url_tiff) assert "Method 'begin_recognize_invoices_from_url' is only available for API version V2_1 and up" in str(e.value) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url_async.py index ecbbb2229d3c..2fd202685cec 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_invoice_from_url_async.py @@ -94,7 +94,8 @@ def callback(raw_response, _, headers): @pytest.mark.live_test_only @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_invoice_continuation_token(self, client): + async def test_invoice_continuation_token(self, **kwargs): + client = kwargs.pop("client") async with client: initial_poller = await client.begin_recognize_invoices_from_url(self.invoice_url_tiff) cont_token = initial_poller.continuation_token() @@ -105,7 +106,8 @@ async def test_invoice_continuation_token(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_invoice_v2(self, client): + async def test_invoice_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: async with client: await client.begin_recognize_invoices_from_url(self.invoice_url_tiff) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt.py index 1c52fed94444..0a7774150180 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt.py @@ -34,7 +34,8 @@ def test_passing_enum_content_type_v2(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_receipts( @@ -44,7 +45,8 @@ def test_damaged_file_bytes_fails_autodetect_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() # TODO should there be a v3 version of this test? - def test_damaged_file_bytes_io_fails_autodetect(self, client): + def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): poller = client.begin_recognize_receipts( @@ -53,7 +55,8 @@ def test_damaged_file_bytes_io_fails_autodetect(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_bad_content_type_param_passed(self, client): + def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -64,7 +67,8 @@ def test_passing_bad_content_type_param_passed(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_passing_unsupported_url_content_type(self, client): + def test_passing_unsupported_url_content_type(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(TypeError): poller = client.begin_recognize_receipts( "https://badurl.jpg", @@ -107,7 +111,8 @@ def test_receipt_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_receipt_locale_v2(self, client): + def test_receipt_locale_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_async.py index dff0fe892360..50547b4d365c 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_async.py @@ -38,7 +38,8 @@ async def test_passing_enum_content_type(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): + async def test_damaged_file_bytes_fails_autodetect_content_type(self, **kwargs): + client = kwargs.pop("client") damaged_pdf = b"\x50\x44\x46\x55\x55\x55" # doesn't match any magic file numbers with pytest.raises(ValueError): async with client: @@ -48,7 +49,9 @@ async def test_damaged_file_bytes_fails_autodetect_content_type(self, client): result = await poller.result() @FormRecognizerPreparer() - async def test_damaged_file_bytes_io_fails_autodetect(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + async def test_damaged_file_bytes_io_fails_autodetect(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = FormRecognizerClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) damaged_pdf = BytesIO(b"\x50\x44\x46\x55\x55\x55") # doesn't match any magic file numbers with pytest.raises(ValueError): @@ -60,7 +63,8 @@ async def test_damaged_file_bytes_io_fails_autodetect(self, formrecognizer_test_ @FormRecognizerPreparer() @FormRecognizerClientPreparer() - async def test_passing_bad_content_type_param_passed(self, client): + async def test_passing_bad_content_type_param_passed(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: myfile = fd.read() with pytest.raises(ValueError): @@ -108,7 +112,8 @@ async def test_receipt_jpg_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_receipt_locale_v2(self, client): + async def test_receipt_locale_v2(self, **kwargs): + client = kwargs.pop("client") with open(self.receipt_jpg, "rb") as fd: receipt = fd.read() with pytest.raises(ValueError) as e: diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url.py index e4e0026be9f7..110892068da2 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url.py @@ -96,7 +96,8 @@ def test_receipt_url_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_receipt_locale_v2(self, client): + def test_receipt_locale_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: client.begin_recognize_receipts_from_url(self.receipt_url_jpg, locale="en-US") assert "'locale' is only available for API version V2_1 and up" in str(e.value) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url_async.py index 37cdfa4e8e4f..9a5bf00084e5 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_frc_receipt_from_url_async.py @@ -99,7 +99,8 @@ async def test_receipt_url_include_field_elements(self, client): @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - async def test_receipt_locale_v2(self, client): + async def test_receipt_locale_v2(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as e: async with client: await client.begin_recognize_receipts_from_url(self.receipt_url_jpg, locale="en-US") diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model.py index 5c38d7838d2c..11fc11342179 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model.py @@ -59,7 +59,8 @@ def test_compose_model_invalid_unlabeled_models_v21(self, client, formrecognizer @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": "2.0"}) - def test_compose_model_bad_api_version(self, client, formrecognizer_storage_container_sas_url, **kwargs): + def test_compose_model_bad_api_version(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as excinfo: poller = client.begin_create_composed_model(["00000000-0000-0000-0000-000000000000", "00000000-0000-0000-0000-000000000000"]) result = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model_async.py index a1a633e67cdf..dc8d7f8298c6 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_compose_model_async.py @@ -61,7 +61,8 @@ async def test_compose_model_invalid_unlabeled_models_v21(self, client, formreco @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": "2.0"}) - async def test_compose_model_bad_api_version(self, client, formrecognizer_storage_container_sas_url, **kwargs): + async def test_compose_model_bad_api_version(self, **kwargs): + client = kwargs.pop("client") async with client: with pytest.raises(ValueError) as excinfo: poller = await client.begin_create_composed_model(["00000000-0000-0000-0000-000000000000", "00000000-0000-0000-0000-000000000000"]) diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training.py index fd128dfa7c27..eb640ab83380 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training.py @@ -287,7 +287,8 @@ def test_training_with_files_filter_v21(self, client, formrecognizer_storage_con @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": "2.0"}) - def test_training_with_model_name_bad_api_version(self, client): + def test_training_with_model_name_bad_api_version(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as excinfo: poller = client.begin_training(training_files_url="url", use_training_labels=True, model_name="not supported in v2.0") result = poller.result() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training_async.py index a86fb90d84cd..738506b5dfeb 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_ftc_training_async.py @@ -290,7 +290,8 @@ async def test_training_with_files_filter_v21(self, client, formrecognizer_stora @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": "2.0"}) - async def test_training_with_model_name_bad_api_version(self, client): + async def test_training_with_model_name_bad_api_version(self, **kwargs): + client = kwargs.pop("client") with pytest.raises(ValueError) as excinfo: async with client: poller = await client.begin_training(training_files_url="url", use_training_labels=True, model_name="not supported in v2.0") diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py index 444110217fd2..4460bde2ee1e 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging.py @@ -32,7 +32,9 @@ class TestLogging(FormRecognizerTest): @pytest.mark.live_test_only @FormRecognizerPreparer() - def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + def test_logging_info_dac_client(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() @@ -53,7 +55,9 @@ def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formrecogni @pytest.mark.live_test_only @FormRecognizerPreparer() - def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + def test_logging_info_dmac_client(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() @@ -72,7 +76,9 @@ def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, formrecogn assert message.message.find("REDACTED") == -1 @FormRecognizerPreparer() - def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + def test_mock_quota_exceeded_403(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") response = mock.Mock( status_code=403, @@ -94,7 +100,9 @@ def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formrecogni 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.' @FormRecognizerPreparer() - def test_mock_quota_exceeded_429(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + def test_mock_quota_exceeded_429(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") response = mock.Mock( status_code=429, 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 45846c8723c5..cf088c825f9f 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_logging_async.py @@ -67,7 +67,9 @@ class TestLogging(AsyncFormRecognizerTest): @pytest.mark.live_test_only @FormRecognizerPreparer() - async def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + async def test_logging_info_dac_client(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentAnalysisClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() @@ -88,7 +90,9 @@ async def test_logging_info_dac_client(self, formrecognizer_test_endpoint, formr @pytest.mark.live_test_only @FormRecognizerPreparer() - async def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + async def test_logging_info_dmac_client(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") client = DocumentModelAdministrationClient(formrecognizer_test_endpoint, AzureKeyCredential(formrecognizer_test_api_key)) mock_handler = MockHandler() @@ -107,7 +111,9 @@ async def test_logging_info_dmac_client(self, formrecognizer_test_endpoint, form assert message.message.find("REDACTED") == -1 @FormRecognizerPreparer() - async def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + async def test_mock_quota_exceeded_403(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") response = mock.Mock( status_code=403, @@ -129,7 +135,9 @@ async def test_mock_quota_exceeded_403(self, formrecognizer_test_endpoint, formr 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.' @FormRecognizerPreparer() - async def test_mock_quota_exceeded_429(self, formrecognizer_test_endpoint, formrecognizer_test_api_key): + async def test_mock_quota_exceeded_429(self, **kwargs): + formrecognizer_test_endpoint = kwargs.pop("formrecognizer_test_endpoint") + formrecognizer_test_api_key = kwargs.pop("formrecognizer_test_api_key") response = mock.Mock( status_code=429, headers={"Retry-After": 186688, "Content-Type": "application/json"}, diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py index 5f1a55062caa..a883fd25981a 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi.py @@ -27,32 +27,38 @@ class TestMultiapi(FormRecognizerTest): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_default_api_version_form_recognizer_client(self, client): + def test_default_api_version_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer() - def test_default_api_version_form_training_client(self, client): + def test_default_api_version_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_v2_0_form_recognizer_client(self, client): + def test_v2_0_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.0" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_v2_0_form_training_client(self, client): + def test_v2_0_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.0" in client._client._client._base_url @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1}) - def test_v2_1_form_recognizer_client(self, client): + def test_v2_1_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1}) - def test_v2_1_form_training_client(self, client): + def test_v2_1_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @@ -87,7 +93,8 @@ def test_document_api_version_form_training_client(self): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_default_api_version_document_analysis_client(self, client): + def test_default_api_version_document_analysis_client(self, **kwargs): + client = kwargs.pop("client") assert "2021-09-30-preview" == client._api_version @FormRecognizerPreparer() @@ -107,7 +114,8 @@ def test_form_api_version_document_analysis_client(self): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_default_api_version_document_model_admin_client(self, client): + def test_default_api_version_document_model_admin_client(self, **kwargs): + client = kwargs.pop("client") assert "2021-09-30-preview" == client._api_version @FormRecognizerPreparer() diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py index 060aa1877e24..e8dc95e45082 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/test_multiapi_async.py @@ -26,32 +26,38 @@ class TestMultiapi(AsyncFormRecognizerTest): @FormRecognizerPreparer() @FormRecognizerClientPreparer() - def test_default_api_version_form_recognizer_client(self, client): + def test_default_api_version_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer() - def test_default_api_version_form_training_client(self, client): + def test_default_api_version_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_v2_0_form_recognizer_client(self, client): + def test_v2_0_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.0" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_0}) - def test_v2_0_form_training_client(self, client): + def test_v2_0_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.0" in client._client._client._base_url @FormRecognizerPreparer() @FormRecognizerClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1}) - def test_V2_1_form_recognizer_client(self, client): + def test_V2_1_form_recognizer_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @FormTrainingClientPreparer(client_kwargs={"api_version": FormRecognizerApiVersion.V2_1}) - def test_V2_1_form_training_client(self, client): + def test_V2_1_form_training_client(self, **kwargs): + client = kwargs.pop("client") assert "v2.1" in client._client._client._base_url @FormRecognizerPreparer() @@ -86,7 +92,8 @@ def test_document_api_version_form_training_client(self): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_default_api_version_document_analysis_client(self, client): + def test_default_api_version_document_analysis_client(self, **kwargs): + client = kwargs.pop("client") assert "2021-09-30-preview" == client._api_version @FormRecognizerPreparer() @@ -106,7 +113,8 @@ def test_form_api_version_document_analysis_client(self): @FormRecognizerPreparer() @DocumentAnalysisClientPreparer() - def test_default_api_version_document_model_admin_client(self, client): + def test_default_api_version_document_model_admin_client(self, **kwargs): + client = kwargs.pop("client") assert "2021-09-30-preview" == client._api_version @FormRecognizerPreparer()