[Python-checkins] cpython: test_faulthandler: fix regex on the check_dump_traceback_threads() traceback

victor.stinner python-checkins at python.org
Sun Apr 3 18:46:26 CEST 2011


http://hg.python.org/cpython/rev/cb169f61785b
changeset:   69117:cb169f61785b
user:        Victor Stinner <victor.stinner at haypocalc.com>
date:        Sun Apr 03 18:41:22 2011 +0200
summary:
  test_faulthandler: fix regex on the check_dump_traceback_threads() traceback

The traceback may contain "_is_owned":

Thread 0x40962b90:
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/threading.py", line 220 in _is_owned
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/threading.py", line 227 in wait
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/threading.py", line 421 in wait
  File "<string>", line 23 in run
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/threading.py", line 735 in _bootstrap_inner
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/threading.py", line 708 in _bootstrap

Current thread XXX:
  File "<string>", line 10 in dump
  File "<string>", line 28 in <module>

files:
  Lib/test/test_faulthandler.py |  5 ++---
  1 files changed, 2 insertions(+), 3 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
@@ -325,9 +325,8 @@
             lineno = 10
         regex = """
 ^Thread 0x[0-9a-f]+:
-(?:  File ".*threading.py", line [0-9]+ in wait
-)?  File ".*threading.py", line [0-9]+ in wait
-  File "<string>", line 23 in run
+(?:  File ".*threading.py", line [0-9]+ in [_a-z]+
+){{1,3}}  File "<string>", line 23 in run
   File ".*threading.py", line [0-9]+ in _bootstrap_inner
   File ".*threading.py", line [0-9]+ in _bootstrap
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list