Skip to content

Commit 474d925

Browse files
authored
Fix @flaky handler to catch subprocess.TimeoutExpired exception. (#25205)
Fix flaky handler to catch subprocess.TimeoutExpired exception. This way test_main_thread_em_asm_pthread will actually be attempted to be repeated as flaky. #25175 E.g. flaky failure at http://clbri.com:8010/api/v2/logs/49999/raw_inline was not caught and treated as flaky. Also fixes flaky handling of test_pthread_dlopen_many: http://clbri.com:8010/api/v2/logs/50283/raw_inline , #18887
1 parent e9487bd commit 474d925

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def modified(*args, **kwargs):
246246
for i in range(EMTEST_RETRY_FLAKY):
247247
try:
248248
return f(*args, **kwargs)
249-
except AssertionError as exc:
249+
except (AssertionError, subprocess.TimeoutExpired) as exc:
250250
preserved_exc = exc
251251
logging.info(f'Retrying flaky test "{f.__name__}" (attempt {i}/{EMTEST_RETRY_FLAKY} failed): {exc}')
252252
# Mark down that this was a flaky test.

0 commit comments

Comments
 (0)