|
6 | 6 | # license information. |
7 | 7 | # -------------------------------------------------------------------------- |
8 | 8 |
|
| 9 | +import logging |
9 | 10 | import pytest |
10 | 11 | from functools import wraps |
11 | 12 | from azure.core.exceptions import HttpResponseError |
12 | 13 | import sys |
13 | | -from devtools_testutils import add_remove_header_sanitizer, add_general_regex_sanitizer, add_oauth_response_sanitizer, add_body_key_sanitizer, test_proxy |
14 | | - |
15 | | -# Ignore async tests for Python < 3.6 |
16 | | -collect_ignore_glob = [] |
17 | | -if sys.version_info < (3, 6): |
18 | | - collect_ignore_glob.append("*_async.py") |
| 14 | +from devtools_testutils import ( |
| 15 | + add_remove_header_sanitizer, |
| 16 | + add_general_regex_sanitizer, |
| 17 | + add_oauth_response_sanitizer, |
| 18 | + add_body_key_sanitizer, |
| 19 | + test_proxy, |
| 20 | +) |
19 | 21 |
|
20 | 22 | @pytest.fixture(scope="session", autouse=True) |
21 | 23 | def add_sanitizers(test_proxy): |
@@ -67,6 +69,18 @@ def wrapper(*args, **kwargs): |
67 | 69 | try: |
68 | 70 | return f(*args, **kwargs) |
69 | 71 | except HttpResponseError as error: |
| 72 | + logger = logging.getLogger("azure") |
70 | 73 | if "Invalid request".casefold() in error.message.casefold(): |
71 | | - pytest.mark.skip("flaky service response") |
| 74 | + pytest.mark.skip("flaky service response: {}".format(error)) |
| 75 | + logger.debug("flaky service response: {}".format(error)) |
| 76 | + elif "Generic error".casefold() in error.message.casefold(): |
| 77 | + pytest.mark.skip("flaky service response: {}".format(error)) |
| 78 | + logger.debug("flaky service response: {}".format(error)) |
| 79 | + elif "Timeout" in error.message.casefold(): |
| 80 | + pytest.mark.skip("flaky service response: {}".format(error)) |
| 81 | + logger.debug("flaky service response: {}".format(error)) |
| 82 | + elif "InvalidImage" in error.message.casefold(): |
| 83 | + pytest.mark.skip("flaky service response: {}".format(error)) |
| 84 | + logger.debug("flaky service response: {}".format(error)) |
| 85 | + |
72 | 86 | return wrapper |
0 commit comments