Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[formrecognizer] Migrate to test proxy #21822

Merged
merged 62 commits into from
Jan 4, 2022
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
230e2ba
use assert in testcase
catalinaperalta Nov 17, 2021
78c97fb
replace with assert is not none
catalinaperalta Nov 17, 2021
4bd85b4
update remaining assertions
catalinaperalta Nov 18, 2021
d6ee475
initial test proxy work
catalinaperalta Nov 17, 2021
c677555
add ci.yml update
catalinaperalta Nov 18, 2021
101c3e2
temp
catalinaperalta Nov 18, 2021
22c2966
temp
catalinaperalta Nov 18, 2021
60ac071
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
catalinaperalta Nov 18, 2021
f9308f4
test fixes
catalinaperalta Nov 18, 2021
35bb50e
change assert for error
catalinaperalta Dec 14, 2021
e7865a6
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
catalinaperalta Dec 14, 2021
14a68d8
rstrip endpoint
catalinaperalta Dec 16, 2021
f30bc4a
add sanitizers
catalinaperalta Dec 16, 2021
73e6e44
clean up replacers and FormRecognizerTest, move test vars
catalinaperalta Dec 16, 2021
b278458
use pytest.raises
catalinaperalta Dec 16, 2021
9400ef9
update test_business_card.py
catalinaperalta Dec 16, 2021
abe6101
add business card recordings
catalinaperalta Dec 16, 2021
cdbfc9b
replace blob sas urls
catalinaperalta Dec 16, 2021
4a3ef7f
fix deleted receipt test
catalinaperalta Dec 16, 2021
3d52f02
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
catalinaperalta Dec 16, 2021
0024b9e
update business card tests
catalinaperalta Dec 16, 2021
6ab7318
update content tests
catalinaperalta Dec 16, 2021
b581c7a
update custom forms tests
catalinaperalta Dec 16, 2021
74757e7
update custom model tests
catalinaperalta Dec 16, 2021
2de18c6
update container url sanitizer and custom model import
catalinaperalta Dec 16, 2021
3ff9d5a
update general document tests
catalinaperalta Dec 16, 2021
6f3b066
update layout tests
catalinaperalta Dec 16, 2021
1634d42
delete business card recordings
catalinaperalta Dec 16, 2021
0fb38bc
remove all old recordings
catalinaperalta Dec 16, 2021
0eaf58c
update dac prebuilt tests
catalinaperalta Dec 17, 2021
6379393
rstrip async client endpoint
catalinaperalta Dec 17, 2021
76ea1bc
add oauth functions back in
catalinaperalta Dec 17, 2021
c4228e5
update compose tests
catalinaperalta Dec 17, 2021
67f4306
skip copy model tests
catalinaperalta Dec 17, 2021
994b897
update dmac mgmt tests
catalinaperalta Dec 17, 2021
6a10901
update dmac training tests
catalinaperalta Dec 17, 2021
5290845
update ftc compose tests
catalinaperalta Dec 17, 2021
edaa826
update ftc copy model
catalinaperalta Dec 17, 2021
b0db097
update conftest access token sanitizer
catalinaperalta Dec 17, 2021
e92493c
update ftc mgmt tests
catalinaperalta Dec 17, 2021
da55415
update ftc training tests
catalinaperalta Dec 17, 2021
ebb46da
update get children tests
catalinaperalta Dec 17, 2021
97c1e67
update frc identity doc tests
catalinaperalta Dec 17, 2021
b15ca48
update frc invoice tests
catalinaperalta Dec 17, 2021
892475c
update frc receipt tests
catalinaperalta Dec 17, 2021
9c70c29
update multiapi tests
catalinaperalta Dec 17, 2021
091e234
clean up empty recordings
catalinaperalta Dec 17, 2021
bf60296
remove extra empty recording
catalinaperalta Dec 17, 2021
ddd87d3
update preparer values to match recordings
catalinaperalta Dec 17, 2021
6964da0
dont check for body matching in requests that change during playback
catalinaperalta Dec 17, 2021
6835d5d
add playback condition in _get_blob_url
catalinaperalta Dec 17, 2021
9bf6229
default testing_container_sas_url
catalinaperalta Dec 17, 2021
0787ddf
set bodiless matcher for url tests
catalinaperalta Dec 17, 2021
e4b94a0
set bodiless matcher for mgmt tests using DMAC and FTC
catalinaperalta Dec 17, 2021
761ff2e
move rstrip up in code
catalinaperalta Dec 18, 2021
a8c60de
remove unused code from conftest.py
catalinaperalta Dec 18, 2021
00c2395
make large file tests run only live
catalinaperalta Dec 18, 2021
62ac344
add missing imports
catalinaperalta Dec 18, 2021
6fe43fc
remove extra space
catalinaperalta Dec 18, 2021
b7d8aa8
remove some more large recordings
catalinaperalta Dec 18, 2021
99fdbf5
add missing recording
catalinaperalta Jan 4, 2022
05d69a3
add more recordings
catalinaperalta Jan 4, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ def __init__(self, endpoint, credential, **kwargs):
}
)

try:
endpoint = endpoint.rstrip("/")
except AttributeError:
raise ValueError("Parameter 'endpoint' must be a string.")

catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved
catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved
self._client = FormRecognizer(
endpoint=endpoint,
credential=credential, # type: ignore
Expand Down
31 changes: 31 additions & 0 deletions sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,40 @@
# license information.
# --------------------------------------------------------------------------

import pytest
import sys
from devtools_testutils import add_remove_header_sanitizer, add_general_regex_sanitizer, add_oauth_response_sanitizer, add_body_key_sanitizer, test_proxy

# Ignore async tests for Python < 3.6
collect_ignore_glob = []
if sys.version_info < (3, 6):
collect_ignore_glob.append("*_async.py")

# autouse=True will trigger this fixture on each pytest run, even if it's not explicitly used by a test method
# @pytest.fixture(scope="session", autouse=True)
# def start_proxy(test_proxy):
# return
catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved

@pytest.fixture(scope="session", autouse=True)
def add_sanitizers(test_proxy):
add_remove_header_sanitizer(headers="Ocp-Apim-Subscription-Key")
add_general_regex_sanitizer(
value="fakeendpoint",
regex="(?<=\\/\\/)[a-z-]+(?=\\.cognitiveservices\\.azure\\.com)"
)
add_oauth_response_sanitizer()
add_body_key_sanitizer(
json_path="urlSource",
value="blob_sas_url",
regex="(?<=\\/\\/)[a-z-]+(?=\\.blob\\.core\\.windows\\.net)(.*)$",
)
add_body_key_sanitizer(
json_path="source",
value="blob_sas_url",
regex="(?<=\\/\\/)[a-z-]+(?=\\.blob\\.core\\.windows\\.net)(.*)$",
)
add_body_key_sanitizer(
json_path="accessToken",
value="redacted",
group_for_replace="(\"accessToken\": \"([0-9a-z-]*)\")",
)
catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
FormRecognizerPreparer = functools.partial(
PowerShellPreparer,
'formrecognizer',
formrecognizer_test_endpoint="https://region.api.cognitive.microsoft.com/",
formrecognizer_test_endpoint="https://fakeendpoint.cognitiveservices.azure.com/",
catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved
formrecognizer_test_api_key="fakeZmFrZV9hY29jdW50X2tleQ==",
formrecognizer_storage_container_sas_url="container_sas_url",
formrecognizer_testing_data_container_sas_url="container_sas_url",
Expand Down Expand Up @@ -53,7 +53,7 @@ def create_resource(self, name, **kwargs):
form_recognizer_account_key = os.environ["FORMRECOGNIZER_TEST_API_KEY"]
polling_interval = 5
else:
form_recognizer_account = "https://region.api.cognitive.microsoft.com/"
form_recognizer_account = "https://fakeendpoint.cognitiveservices.azure.com/"
form_recognizer_account_key = "fakeZmFrZV9hY29jdW50X2tleQ=="
polling_interval = 0

kristapratico marked this conversation as resolved.
Show resolved Hide resolved
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
catalinaperalta marked this conversation as resolved.
Show resolved Hide resolved
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"Entries": [],
"Variables": {}
}

Large diffs are not rendered by default.

Loading