Skip to content

gh-90876: Restore the ability to import multiprocessing when sys.executable is None #106464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 9 commits into from
Jul 6, 2023
Merged

gh-90876: Restore the ability to import multiprocessing when sys.executable is None #106464

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
abb1037
gh-90876: Prevent a multiprocessing import error.
gpshead Jul 5, 2023
ec14f6d
Add a regression test.
gpshead Jul 5, 2023
f6f8d59
Test the actual problem, not the implementation.
gpshead Jul 5, 2023
3fc698e
simplify test, skip in non-spawn suites.
gpshead Jul 6, 2023
b2e1c13
avoid \, use if 1: modernize the nearby test.
gpshead Jul 6, 2023
3b311de
fix the windows unguarded sys.executable use.
gpshead Jul 6, 2023
cbafcf4
nicer indentation.
gpshead Jul 6, 2023
7142254
*test* our new decorator... revert errant test change
gpshead Jul 6, 2023
ba6f9fc
Only run test_only_run_in_spawn_testsuite on non-windows within test_…
gpshead Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
avoid \, use if 1: modernize the nearby test.
  • Loading branch information
@gpshead
gpshead committed Jul 6, 2023
commit b2e1c13ed9fa90f86eb3cdd985039c9ceadcabf1
30 changes: 14 additions & 16 deletions Lib/test/_test_multiprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5839,29 +5839,27 @@ def test_namespace(self):


class TestNamedResource(unittest.TestCase):
@only_run_in_spawn_testsuite("spawn specific test.")
def test_global_named_resource_spawn(self):
#
# gh-90549: Check that global named resources in main module
# will not leak by a subprocess, in spawn context.
#
testfn = os_helper.TESTFN
self.addCleanup(os_helper.unlink, testfn)
with open(testfn, 'w', encoding='utf-8') as f:
f.write(textwrap.dedent('''\
import multiprocessing as mp
test_source = """if 1:
import multiprocessing as mp

ctx = mp.get_context('spawn')
ctx = mp.get_context('spawn')

global_resource = ctx.Semaphore()
global_resource = ctx.Semaphore()

def submain(): pass
def submain(): pass

if __name__ == '__main__':
p = ctx.Process(target=submain)
p.start()
p.join()
'''))
rc, out, err = test.support.script_helper.assert_python_ok(testfn)
if __name__ == '__main__':
p = ctx.Process(target=submain)
p.start()
p.join()
"""
rc, out, err = script_helper.assert_python_ok("-c", test_source)
# on error, err = 'UserWarning: resource_tracker: There appear to
# be 1 leaked semaphore objects to clean up at shutdown'
self.assertEqual(err, b'')
Expand All @@ -5879,8 +5877,8 @@ def test_spawn_sys_executable_none_allows_import(self):
# https://github.com/python/cpython/issues/90876 that caused an
# ImportError in multiprocessing when sys.executable was None.
# This can be true in embedded environments.
rc, _, err = script_helper.assert_python_ok(
"-c", """\
rc, out, err = script_helper.assert_python_ok(
"-c", """if 1:
import sys
sys.executable = None
assert "multiprocessing" not in sys.modules, "mp already imported!"
Expand Down