From 301f3f093c463b8eba8f55d6cb3eecc0893d5cfa Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 1 Jun 2011 13:49:12 +0200 Subject: [PATCH] test_faulthandler: use a longer sleep (2.5 sec instead of 1.3 sec) in _check_dump_tracebacks_later() to avoid failures if the system is slow. --- Lib/test/test_faulthandler.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py index dbc19178a1c..0ddfc7f66fa 100644 --- a/Lib/test/test_faulthandler.py +++ b/Lib/test/test_faulthandler.py @@ -29,13 +29,14 @@ def prepare_subprocess(): except (ValueError, resource_error): pass -def expected_traceback(lineno1, lineno2, header, count=1): +def expected_traceback(lineno1, lineno2, header, min_count=1): regex = header regex += ' File "", line %s in func\n' % lineno1 regex += ' File "", line %s in ' % lineno2 - if count != 1: - regex = (regex + '\n') * (count - 1) + regex - return '^' + regex + '$' + if 1 < min_count: + return '^' + (regex + '\n') * (min_count - 1) + regex + else: + return '^' + regex + '$' @contextmanager def temporary_filename(): @@ -371,7 +372,7 @@ def func(timeout, repeat, cancel, file, loops): faulthandler.dump_tracebacks_later(timeout, repeat=repeat, file=file) if cancel: faulthandler.cancel_dump_tracebacks_later() - time.sleep(timeout * 2.5) + time.sleep(timeout * 5) faulthandler.cancel_dump_tracebacks_later() timeout = {timeout} @@ -402,7 +403,7 @@ def func(timeout, repeat, cancel, file, loops): if repeat: count *= 2 header = r'Timeout \(%s\)!\nThread 0x[0-9a-f]+:\n' % timeout_str - regex = expected_traceback(9, 20, header, count=count) + regex = expected_traceback(9, 20, header, min_count=count) self.assertRegex(trace, regex) else: self.assertEqual(trace, '')