[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2
richard.oudkerk
python-checkins at python.org
Tue Aug 14 13:55:25 CEST 2012
http://hg.python.org/cpython/rev/8208f3ef3202
changeset: 78563:8208f3ef3202
parent: 78560:e1e7d628c0b9
parent: 78562:20f8a2455ffb
user: Richard Oudkerk <shibturn at gmail.com>
date: Tue Aug 14 12:51:14 2012 +0100
summary:
Merge 3.2
files:
Lib/multiprocessing/forking.py | 2 +-
Lib/test/mp_fork_bomb.py | 13 +++++++++++
Lib/test/test_multiprocessing.py | 23 +++++++++++++++++++-
Misc/NEWS | 4 +++
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -305,7 +305,7 @@
'''
Returns prefix of command line used for spawning a child process
'''
- if process.current_process()._identity==() and is_forking(sys.argv):
+ if getattr(process.current_process(), '_inheriting', False):
raise RuntimeError('''
Attempt to start a new process before the current process
has finished its bootstrapping phase.
diff --git a/Lib/test/mp_fork_bomb.py b/Lib/test/mp_fork_bomb.py
new file mode 100644
--- /dev/null
+++ b/Lib/test/mp_fork_bomb.py
@@ -0,0 +1,13 @@
+import multiprocessing, sys
+
+def foo():
+ print("123")
+
+# Because "if __name__ == '__main__'" is missing this will not work
+# correctly on Windows. However, we should get a RuntimeError rather
+# than the Windows equivalent of a fork bomb.
+
+p = multiprocessing.Process(target=foo)
+p.start()
+p.join()
+sys.exit(p.exitcode)
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -20,6 +20,7 @@
import logging
import struct
import test.support
+import test.script_helper
# Skip tests if _multiprocessing wasn't built.
@@ -3346,9 +3347,29 @@
finally:
socket.setdefaulttimeout(old_timeout)
+#
+# Test what happens with no "if __name__ == '__main__'"
+#
+
+class TestNoForkBomb(unittest.TestCase):
+ def test_noforkbomb(self):
+ name = os.path.join(os.path.dirname(__file__), 'mp_fork_bomb.py')
+ if WIN32:
+ rc, out, err = test.script_helper.assert_python_failure(name)
+ self.assertEqual('', out.decode('ascii'))
+ self.assertIn('RuntimeError', err.decode('ascii'))
+ else:
+ rc, out, err = test.script_helper.assert_python_ok(name)
+ self.assertEqual('123', out.decode('ascii').rstrip())
+ self.assertEqual('', err.decode('ascii'))
+
+#
+#
+#
+
testcases_other = [OtherTest, TestInvalidHandle, TestInitializers,
TestStdinBadfiledescriptor, TestWait, TestInvalidFamily,
- TestFlags, TestTimeouts]
+ TestFlags, TestTimeouts, TestNoForkBomb]
#
#
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,10 @@
Library
-------
+- Issue #15646: Prevent equivalent of a fork bomb when using
+ multiprocessing on Windows without the "if __name__ == '__main__'"
+ idiom.
+
C API
-----
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list