From: Sam Gross <colesbury@gmail.com>
Date: Mon, 15 Jul 2024 20:43:51 +0000 (-0400)
Subject: gh-117657: Skip tests that fork with threads under TSan (#121599)
X-Git-Tag: v3.14.0a1~1122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82a4dac9f6131954c32dac9d0277283fc5b499a9;p=thirdparty%2FPython%2Fcpython.git

gh-117657: Skip tests that fork with threads under TSan (#121599)

This avoids messages like:

  ThreadSanitizer: starting new threads after multi-threaded fork is not
  supported. Dying (set die_after_fork=0 to override)
---

diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index e6daea2333b2..6d688d4b81bb 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -3972,6 +3972,7 @@ class ConfigDictTest(BaseTest):
             )
         manager.assert_not_called()
 
+    @skip_if_tsan_fork
     @support.requires_subprocess()
     def test_multiprocessing_queues(self):
         # See gh-119819
@@ -4284,6 +4285,7 @@ if hasattr(logging.handlers, 'QueueListener'):
     import multiprocessing
     from unittest.mock import patch
 
+    @skip_if_tsan_fork
     @threading_helper.requires_working_threading()
     class QueueListenerTest(BaseTest):
         """
@@ -5184,6 +5186,7 @@ class LogRecordTest(BaseTest):
         else:
             return results
 
+    @skip_if_tsan_fork
     def test_multiprocessing(self):
         support.skip_if_broken_multiprocessing_synchronize()
         multiprocessing_imported = 'multiprocessing' in sys.modules