mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 10:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-112536: Add test_threading to TSAN tests (#116898)

Browse source
This commit is contained in:
Antoine Pitrou 2024-03-16 12:55:46 +01:00 • committed by GitHub
parent c61cb507c1
commit 86bc40dd41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/libregrtest/tsan.py
View file

@ -14,6 +14,7 @@ TSAN_TESTS = [
'test_syslog', 'test_syslog',
'test_thread', 'test_thread',
'test_threadedtempfile', 'test_threadedtempfile',
'test_threading',
'test_threading_local', 'test_threading_local',
'test_threadsignals', 'test_threadsignals',
] ]

4
Lib/test/support/script_helper.py
View file

@ -63,8 +63,8 @@ class _PythonRunResult(collections.namedtuple("_PythonRunResult",
"""Helper for reporting Python subprocess run results""" """Helper for reporting Python subprocess run results"""
def fail(self, cmd_line): def fail(self, cmd_line):
"""Provide helpful details about failed subcommand runs""" """Provide helpful details about failed subcommand runs"""
# Limit to 80 lines to ASCII characters # Limit to 300 lines of ASCII characters
maxlen = 80 * 100 maxlen = 300 * 100
out, err = self.out, self.err out, err = self.out, self.err
if len(out) > maxlen: if len(out) > maxlen:
out = b'(... truncated stdout ...)' + out[-maxlen:] out = b'(... truncated stdout ...)' + out[-maxlen:]

24
Lib/test/test_threading.py
View file

@ -47,14 +47,11 @@ def skip_unless_reliable_fork(test):
return unittest.skip("due to known OS bug related to thread+fork")(test) return unittest.skip("due to known OS bug related to thread+fork")(test)
if support.HAVE_ASAN_FORK_BUG: if support.HAVE_ASAN_FORK_BUG:
return unittest.skip("libasan has a pthread_create() dead lock related to thread+fork")(test) return unittest.skip("libasan has a pthread_create() dead lock related to thread+fork")(test)
if support.check_sanitizer(thread=True):
return unittest.skip("TSAN doesn't support threads after fork")
return test return test
skip_if_tsan_fork = unittest.skipIf(
support.check_sanitizer(thread=True),
"TSAN doesn't support threads after fork")
def requires_subinterpreters(meth): def requires_subinterpreters(meth):
"""Decorator to skip a test if subinterpreters are not supported.""" """Decorator to skip a test if subinterpreters are not supported."""
return unittest.skipIf(interpreters is None, return unittest.skipIf(interpreters is None,
@ -428,6 +425,10 @@ class ThreadTests(BaseTestCase):
# Issue 1402: the PyGILState_Ensure / _Release functions may be called # Issue 1402: the PyGILState_Ensure / _Release functions may be called
# very late on python exit: on deallocation of a running thread for # very late on python exit: on deallocation of a running thread for
# example. # example.
if support.check_sanitizer(thread=True):
# the thread running `time.sleep(100)` below will still be alive
# at process exit
self.skipTest("TSAN would report thread leak")
import_module("ctypes") import_module("ctypes")
rc, out, err = assert_python_failure("-c", """if 1: rc, out, err = assert_python_failure("-c", """if 1:
@ -460,6 +461,11 @@ class ThreadTests(BaseTestCase):
def test_finalize_with_trace(self): def test_finalize_with_trace(self):
# Issue1733757 # Issue1733757
# Avoid a deadlock when sys.settrace steps into threading._shutdown # Avoid a deadlock when sys.settrace steps into threading._shutdown
if support.check_sanitizer(thread=True):
# the thread running `time.sleep(2)` below will still be alive
# at process exit
self.skipTest("TSAN would report thread leak")
assert_python_ok("-c", """if 1: assert_python_ok("-c", """if 1:
import sys, threading import sys, threading
@ -639,7 +645,6 @@ class ThreadTests(BaseTestCase):
self.assertTrue(t.daemon) self.assertTrue(t.daemon)
@skip_unless_reliable_fork @skip_unless_reliable_fork
@skip_if_tsan_fork
def test_dummy_thread_after_fork(self): def test_dummy_thread_after_fork(self):
# Issue #14308: a dummy thread in the active list doesn't mess up # Issue #14308: a dummy thread in the active list doesn't mess up
# the after-fork mechanism. # the after-fork mechanism.
@ -709,7 +714,6 @@ class ThreadTests(BaseTestCase):
@skip_unless_reliable_fork @skip_unless_reliable_fork
@unittest.skipUnless(hasattr(os, 'waitpid'), "test needs os.waitpid()") @unittest.skipUnless(hasattr(os, 'waitpid'), "test needs os.waitpid()")
@skip_if_tsan_fork
def test_main_thread_after_fork(self): def test_main_thread_after_fork(self):
code = """if 1: code = """if 1:
import os, threading import os, threading
@ -1278,7 +1282,6 @@ class ThreadJoinOnShutdown(BaseTestCase):
self._run_and_join(script) self._run_and_join(script)
@skip_unless_reliable_fork @skip_unless_reliable_fork
@skip_if_tsan_fork
def test_3_join_in_forked_from_thread(self): def test_3_join_in_forked_from_thread(self):
# Like the test above, but fork() was called from a worker thread # Like the test above, but fork() was called from a worker thread
# In the forked process, the main Thread object must be marked as stopped. # In the forked process, the main Thread object must be marked as stopped.
@ -1311,6 +1314,11 @@ class ThreadJoinOnShutdown(BaseTestCase):
# Check that a daemon thread cannot crash the interpreter on shutdown # Check that a daemon thread cannot crash the interpreter on shutdown
# by manipulating internal structures that are being disposed of in # by manipulating internal structures that are being disposed of in
# the main thread. # the main thread.
if support.check_sanitizer(thread=True):
# some of the threads running `random_io` below will still be alive
# at process exit
self.skipTest("TSAN would report thread leak")
script = """if True: script = """if True:
import os import os
import random import random