summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_faulthandler.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-03 16:41:22 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-03 16:41:22 (GMT)
commit1b3241fa0cbf72ec5220d64fdfc6f2982af15c3c (patch)
tree675917bc55f63cc3d8842fe4b56e425616095a65 /Lib/test/test_faulthandler.py
parent6dca52772b4b979652565442ef247deddacc269f (diff)
downloadcpython-1b3241fa0cbf72ec5220d64fdfc6f2982af15c3c.zip
cpython-1b3241fa0cbf72ec5220d64fdfc6f2982af15c3c.tar.gz
cpython-1b3241fa0cbf72ec5220d64fdfc6f2982af15c3c.tar.bz2
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>
Diffstat (limited to 'Lib/test/test_faulthandler.py')
-rw-r--r--Lib/test/test_faulthandler.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index a919900..2730aff 100644
--- a/Lib/test/test_faulthandler.py
+++ b/Lib/test/test_faulthandler.py
@@ -325,9 +325,8 @@ waiter.join()
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