[Python-checkins] cpython: test_faulthandler: use a longer sleep (2.5 sec instead of 1.3 sec) in
victor.stinner
python-checkins at python.org
Wed Jun 1 13:49:29 CEST 2011
http://hg.python.org/cpython/rev/e064191a3876
changeset: 70577:e064191a3876
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Wed Jun 01 13:49:12 2011 +0200
summary:
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.
files:
Lib/test/test_faulthandler.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -29,13 +29,14 @@
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 "<string>", line %s in func\n' % lineno1
regex += ' File "<string>", line %s in <module>' % 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 @@
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 @@
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, '')
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list