Skip to content

Commit 36b1b38

Browse files
authored
Re-enable retries in deep canary (#4035)
1 parent 272daa0 commit 36b1b38

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

test/dlc_tests/sanity/test_canary_integration.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ def _run_canary_pull_test(region, image_type):
6161

6262
@pytest.mark.usefixtures("sagemaker")
6363
@pytest.mark.skipif(
64-
not is_deep_canary_context(), reason="This test only needs to run in deep-canary context"
64+
not is_deep_canary_context() or os.getenv("REGION") == "us-west-2",
65+
reason="This test only needs to run in deep-canary context",
6566
)
6667
@pytest.mark.deep_canary(
6768
"Reason: This test acts as a basic smoke check that deep-canary tests work in a region"

test/testrunner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ def main():
449449
# Add rerun flag to canaries to avoid flakiness. Force pytest to collect only
450450
# deep-canary tests, and prevent wastage of threads in the skipping of
451451
# non-deep-canary tests.
452-
canary_pytest_args = ["-m", "deep_canary"]
452+
canary_pytest_args = [pytest_rerun_arg, pytest_rerun_delay_arg, "-m", "deep_canary"]
453453
pytest_cmds = [pytest_cmd + canary_pytest_args for pytest_cmd in pytest_cmds]
454454

455455
pytest_cmds = [

0 commit comments

Comments
 (0)