From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 3 Apr 2011 16:41:22 +0000 (+0200)
Subject: test_faulthandler: fix regex on the check_dump_traceback_threads() traceback
X-Git-Tag: v3.3.0a1~2687
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b3241fa0cbf72ec5220d64fdfc6f2982af15c3c;p=python

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>
---

diff --git a/Lib/test/test_faulthandler.py b/Lib/test/test_faulthandler.py
index a919900546..2730aff7c0 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