Quick fix for keep-going + reruns (#102569)

Currently file level reruns + stepcurrent are incompatible and it's making PRs green when they are actually red, so turn off stepcurrent + file level reruns when keep-going is used until I figure out a better way to do this.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/102569
Approved by: https://github.com/huydhn
This commit is contained in:
Catherine Lee
2023-05-30 21:29:51 +00:00
committed by PyTorch MergeBot
parent f14ac74fce
commit 7f6edcf422

View File

@ -594,7 +594,11 @@ def run_test(
os.close(log_fd)
command = (launcher_cmd or []) + executable + argv
should_file_rerun = "--subprocess" not in command and not RERUN_DISABLED_TESTS
should_file_rerun = (
"--subprocess" not in command
and not RERUN_DISABLED_TESTS
and not options.continue_on_error
)
timeout = (
THRESHOLD * 3
if should_file_rerun
@ -971,9 +975,9 @@ def get_pytest_args(
]
if not is_cpp_test:
# C++ tests need to be run with pytest directly, not via python
pytest_args.extend(
["-p", "no:xdist", "--use-pytest", f"--sc={stepcurrent_key}"]
)
pytest_args.extend(["-p", "no:xdist", "--use-pytest"])
if not options.continue_through_error:
pytest_args.append(f"--sc={stepcurrent_key}")
else:
# Use pytext-dist to run C++ tests in parallel as running them sequentially using run_test
# is much slower than running them directly