From 3a812ca0d057a81fc0f7985acae6aed36ef4c7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?McCoy=20Pati=C3=B1o?= Date: Mon, 20 Sep 2021 17:58:23 -0700 Subject: [PATCH] Update add_sanitizer and doc --- doc/dev/test_proxy_migration_guide.md | 3 ++- .../devtools_testutils/azure_recorded_testcase.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/dev/test_proxy_migration_guide.md b/doc/dev/test_proxy_migration_guide.md index ff31703912b9..7dea06788a81 100644 --- a/doc/dev/test_proxy_migration_guide.md +++ b/doc/dev/test_proxy_migration_guide.md @@ -108,7 +108,8 @@ adding something like the following in the package's `conftest.py` file: ```python from devtools_testutils import add_sanitizer -@pytest.fixture(scope="session") +# 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 sanitize_uris(): add_sanitizer(ProxyRecordingSanitizer.URI, value="fakeendpoint") ``` diff --git a/tools/azure-sdk-tools/devtools_testutils/azure_recorded_testcase.py b/tools/azure-sdk-tools/devtools_testutils/azure_recorded_testcase.py index 96452251da3d..969d80fe57fe 100644 --- a/tools/azure-sdk-tools/devtools_testutils/azure_recorded_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/azure_recorded_testcase.py @@ -52,7 +52,9 @@ def add_sanitizer(sanitizer, **kwargs): """ request_args = {} request_args["value"] = kwargs.get("value") or "fakevalue" - request_args["regex"] = kwargs.get("regex") or "[a-z]+(?=(?:-secondary)\\.(?:table|blob|queue)\\.core\\.windows\\.net)" + request_args["regex"] = ( + kwargs.get("regex") or "(?<=\\/\\/)[a-z]+(?=(?:|-secondary)\\.(?:table|blob|queue)\\.core\\.windows\\.net)" + ) request_args["group_for_replace"] = kwargs.get("group_for_replace") if sanitizer == ProxyRecordingSanitizer.URI: @@ -62,7 +64,7 @@ def add_sanitizer(sanitizer, **kwargs): json={ "regex": request_args["regex"], "value": request_args["value"], - "groupForReplace": request_args["group_for_replace"] + "groupForReplace": request_args["group_for_replace"], }, )