diff options
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 2 | ||||
| -rw-r--r-- | Lib/test/support/__init__.py | 23 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_events.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_logging.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_multiprocessing_main_handling.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_venv.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2020-06-17-18-00-21.bpo-38377.jfg4TH.rst | 4 |
8 files changed, 41 insertions, 12 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index cceba7a..bdc9758 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -33,7 +33,7 @@ from test.support import socket_helper # Skip tests if _multiprocessing wasn't built. _multiprocessing = test.support.import_module('_multiprocessing') # Skip tests if sem_open implementation is broken. -test.support.import_module('multiprocessing.synchronize') +support.skip_if_broken_multiprocessing_synchronize() import threading import multiprocessing.connection diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index a847e65..28738da 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -3168,3 +3168,26 @@ def save_restore_warnings_filters(): yield finally: warnings.filters[:] = old_filters + + +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. + """ + + # Skip tests if the _multiprocessing extension is missing. + import_module('_multiprocessing') + + # Skip tests if there is no available semaphore implementation: + # 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}") diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py index 0fb3618..7bc9c9a 100644 --- a/Lib/test/test_asyncio/test_events.py +++ b/Lib/test/test_asyncio/test_events.py @@ -2672,10 +2672,10 @@ class GetEventLoopTestsMixin: if sys.platform != 'win32': def test_get_event_loop_new_process(self): - # Issue bpo-32126: The multiprocessing module used by + # bpo-32126: The multiprocessing module used by # ProcessPoolExecutor is not functional when the # multiprocessing.synchronize module cannot be imported. - support.import_module('multiprocessing.synchronize') + support.skip_if_broken_multiprocessing_synchronize() async def main(): pool = concurrent.futures.ProcessPoolExecutor() diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index bb2bc75..4fe4bf7 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -3,7 +3,7 @@ from test import support # Skip tests if _multiprocessing wasn't built. support.import_module('_multiprocessing') # Skip tests if sem_open implementation is broken. -support.import_module('multiprocessing.synchronize') +support.skip_if_broken_multiprocessing_synchronize() from test.support import hashlib_helper from test.support.script_helper import assert_python_ok diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 9a11445..8fea47a 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3629,9 +3629,9 @@ if hasattr(logging.handlers, 'QueueListener'): @patch.object(logging.handlers.QueueListener, 'handle') def test_handle_called_with_mp_queue(self, mock_handle): - # Issue 28668: The multiprocessing (mp) module is not functional + # bpo-28668: The multiprocessing (mp) module is not functional # when the mp.synchronize module cannot be imported. - support.import_module('multiprocessing.synchronize') + support.skip_if_broken_multiprocessing_synchronize() for i in range(self.repeat): log_queue = multiprocessing.Queue() self.setup_and_log(log_queue, '%s_%s' % (self.id(), i)) @@ -3655,9 +3655,9 @@ if hasattr(logging.handlers, 'QueueListener'): indicates that messages were not registered on the queue until _after_ the QueueListener stopped. """ - # Issue 28668: The multiprocessing (mp) module is not functional + # bpo-28668: The multiprocessing (mp) module is not functional # when the mp.synchronize module cannot be imported. - support.import_module('multiprocessing.synchronize') + support.skip_if_broken_multiprocessing_synchronize() for i in range(self.repeat): queue = multiprocessing.Queue() self.setup_and_log(queue, '%s_%s' %(self.id(), i)) diff --git a/Lib/test/test_multiprocessing_main_handling.py b/Lib/test/test_multiprocessing_main_handling.py index b6abfcc..be1ff10 100644 --- a/Lib/test/test_multiprocessing_main_handling.py +++ b/Lib/test/test_multiprocessing_main_handling.py @@ -23,7 +23,7 @@ import multiprocessing AVAILABLE_START_METHODS = set(multiprocessing.get_all_start_methods()) # Issue #22332: Skip tests if sem_open implementation is broken. -support.import_module('multiprocessing.synchronize') +support.skip_if_broken_multiprocessing_synchronize() verbose = support.verbose diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py index ef6d7bd..d3191ed 100644 --- a/Lib/test/test_venv.py +++ b/Lib/test/test_venv.py @@ -16,7 +16,8 @@ import sys import tempfile from test.support import (captured_stdout, captured_stderr, requires_zlib, can_symlink, EnvironmentVarGuard, rmtree, - import_module) + import_module, + skip_if_broken_multiprocessing_synchronize) import unittest import venv from unittest.mock import patch @@ -357,10 +358,11 @@ class BasicTest(BaseTest): """ Test that the multiprocessing is able to spawn. """ - # Issue bpo-36342: Instantiation of a Pool object imports the + # bpo-36342: Instantiation of a Pool object imports the # multiprocessing.synchronize module. Skip the test if this module # cannot be imported. - import_module('multiprocessing.synchronize') + skip_if_broken_multiprocessing_synchronize() + rmtree(self.env_dir) self.run_with_capture(venv.create, self.env_dir) envpy = os.path.join(os.path.realpath(self.env_dir), diff --git a/Misc/NEWS.d/next/Tests/2020-06-17-18-00-21.bpo-38377.jfg4TH.rst b/Misc/NEWS.d/next/Tests/2020-06-17-18-00-21.bpo-38377.jfg4TH.rst new file mode 100644 index 0000000..11a3076 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2020-06-17-18-00-21.bpo-38377.jfg4TH.rst @@ -0,0 +1,4 @@ +On Linux, skip tests using multiprocessing if the current user cannot create +a file in ``/dev/shm/`` directory. Add the +:func:`~test.support.skip_if_broken_multiprocessing_synchronize` function to +the :mod:`test.support` module. |