diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py b/sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py index 0bf3ca4f0253..948404e2d43d 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py +++ b/sdk/formrecognizer/azure-ai-formrecognizer/tests/conftest.py @@ -6,16 +6,18 @@ # license information. # -------------------------------------------------------------------------- +import logging import pytest from functools import wraps from azure.core.exceptions import HttpResponseError 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") +from devtools_testutils import ( + add_remove_header_sanitizer, + add_general_regex_sanitizer, + add_oauth_response_sanitizer, + add_body_key_sanitizer, + test_proxy, +) @pytest.fixture(scope="session", autouse=True) def add_sanitizers(test_proxy): @@ -67,6 +69,18 @@ def wrapper(*args, **kwargs): try: return f(*args, **kwargs) except HttpResponseError as error: + logger = logging.getLogger("azure") if "Invalid request".casefold() in error.message.casefold(): - pytest.mark.skip("flaky service response") + pytest.mark.skip("flaky service response: {}".format(error)) + logger.debug("flaky service response: {}".format(error)) + elif "Generic error".casefold() in error.message.casefold(): + pytest.mark.skip("flaky service response: {}".format(error)) + logger.debug("flaky service response: {}".format(error)) + elif "Timeout" in error.message.casefold(): + pytest.mark.skip("flaky service response: {}".format(error)) + logger.debug("flaky service response: {}".format(error)) + elif "InvalidImage" in error.message.casefold(): + pytest.mark.skip("flaky service response: {}".format(error)) + logger.debug("flaky service response: {}".format(error)) + return wrapper