From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Sep 2018 20:48:03 +0000 (-0700)
Subject: closes bpo-34004: Skip lock interruption tests on musl. (GH-9224)
X-Git-Tag: v3.8.0a1~1025
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b10d5111d7a855297654af9045f8907b7d3dd08;p=thirdparty%2FPython%2Fcpython.git

closes bpo-34004: Skip lock interruption tests on musl. (GH-9224)

Returning EINTR from pthread semaphore or lock acquisition is an optional POSIX
feature. musl does not provide this feature, so some threadsignal tests fail
when Python is built against it.

There's no good way to test for musl, so we skip if we're on Linux and not using
glibc pthreads.

Also, hedge in the threading documentation about when we can provide interrupts
from lock acquisition.
---

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index b94021b4eb8f..e6185c5b3a21 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -400,7 +400,8 @@ All methods are executed atomically.
          The *timeout* parameter is new.
 
       .. versionchanged:: 3.2
-         Lock acquires can now be interrupted by signals on POSIX.
+         Lock acquisition can now be interrupted by signals on POSIX if the
+         underlying threading implementation supports it.
 
 
    .. method:: release()
diff --git a/Lib/test/test_threadsignals.py b/Lib/test/test_threadsignals.py
index 1ad6c63fea2e..7e13b1720f91 100644
--- a/Lib/test/test_threadsignals.py
+++ b/Lib/test/test_threadsignals.py
@@ -78,6 +78,10 @@ class ThreadSignals(unittest.TestCase):
 
     @unittest.skipIf(USING_PTHREAD_COND,
                      'POSIX condition variables cannot be interrupted')
+    @unittest.skipIf(sys.platform.startswith('linux') and
+                     not sys.thread_info.version,
+                     'Issue 34004: musl does not allow interruption of locks '
+                     'by signals.')
     # Issue #20564: sem_timedwait() cannot be interrupted on OpenBSD
     @unittest.skipIf(sys.platform.startswith('openbsd'),
                      'lock cannot be interrupted on OpenBSD')
@@ -105,6 +109,10 @@ class ThreadSignals(unittest.TestCase):
 
     @unittest.skipIf(USING_PTHREAD_COND,
                      'POSIX condition variables cannot be interrupted')
+    @unittest.skipIf(sys.platform.startswith('linux') and
+                     not sys.thread_info.version,
+                     'Issue 34004: musl does not allow interruption of locks '
+                     'by signals.')
     # Issue #20564: sem_timedwait() cannot be interrupted on OpenBSD
     @unittest.skipIf(sys.platform.startswith('openbsd'),
                      'lock cannot be interrupted on OpenBSD')