summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-06-19 09:19:38 -0700
committerGitHub <noreply@github.com>2020-06-19 09:19:38 -0700
commitec9bc2da421c456e416d991fd1fe79ac33344d9d (patch)
tree8ffd3c14110b11a10116745072f1b54e8db3de09
parent4dd10ed6942ab99bc5b0b1c5ecc88a753877aefd (diff)
downloadcpython-git-ec9bc2da421c456e416d991fd1fe79ac33344d9d.tar.gz
bpo-38377: Fix skip_if_broken_multiprocessing_synchronize() on macOS (GH-20984)
skip_if_broken_multiprocessing_synchronize() only attempts for create a semaphore on Linux to fix multiprocessing test_resource_tracker_reused() on macOS. (cherry picked from commit 3358da4054b9b0b045eb47dc74dee3d58bfbb1d5) Co-authored-by: Victor Stinner <vstinner@python.org>
-rw-r--r--Lib/test/support/__init__.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index b75dbd214f..3d287a98ac 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -3383,7 +3383,7 @@ def skip_if_broken_multiprocessing_synchronize():
"""
Skip tests if the multiprocessing.synchronize module is missing, if there
is no available semaphore implementation, or if creating a lock raises an
- OSError.
+ OSError (on Linux only).
"""
# Skip tests if the _multiprocessing extension is missing.
@@ -3393,10 +3393,11 @@ def skip_if_broken_multiprocessing_synchronize():
# multiprocessing.synchronize requires _multiprocessing.SemLock.
synchronize = import_module('multiprocessing.synchronize')
- try:
- # bpo-38377: On Linux, creating a semaphore is the current user
- # does not have the permission to create a file in /dev/shm.
- # Create a semaphore to check permissions.
- synchronize.Lock(ctx=None)
- except OSError as exc:
- raise unittest.SkipTest(f"broken multiprocessing SemLock: {exc!r}")
+ if sys.platform == "linux":
+ try:
+ # bpo-38377: On Linux, creating a semaphore fails with OSError
+ # if the current user does not have the permission to create
+ # a file in /dev/shm/ directory.
+ synchronize.Lock(ctx=None)
+ except OSError as exc:
+ raise unittest.SkipTest(f"broken multiprocessing SemLock: {exc!r}")