summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_multiprocessing.py
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-06-06 18:04:57 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-06-06 18:04:57 (GMT)
commit29471de459a9371d7538a9838b1b20c86df29ca7 (patch)
tree1c63299219f02f10b5e1cf94c1a67a9cde8492d5 /Lib/test/test_multiprocessing.py
parente41682b9945091c2e4b95a3f6a4582944fd7598e (diff)
downloadcpython-29471de459a9371d7538a9838b1b20c86df29ca7.zip
cpython-29471de459a9371d7538a9838b1b20c86df29ca7.tar.gz
cpython-29471de459a9371d7538a9838b1b20c86df29ca7.tar.bz2
Issue #13854: Properly handle non-integer, non-string arg to SystemExit
Previously multiprocessing only expected int or str. It also wrongly used an exit code of 1 when the argument was a string instead of zero.
Diffstat (limited to 'Lib/test/test_multiprocessing.py')
-rw-r--r--Lib/test/test_multiprocessing.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
index 0d98a14..b812e48 100644
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -390,6 +390,36 @@ class _TestSubclassingProcess(BaseTestCase):
1/0 # MARKER
+ @classmethod
+ def _test_sys_exit(cls, reason, testfn):
+ sys.stderr = open(testfn, 'w')
+ sys.exit(reason)
+
+ def test_sys_exit(self):
+ # See Issue 13854
+ if self.TYPE == 'threads':
+ return
+
+ testfn = test.support.TESTFN
+ self.addCleanup(test.support.unlink, testfn)
+
+ for reason, code in (([1, 2, 3], 1), ('ignore this', 0)):
+ p = self.Process(target=self._test_sys_exit, args=(reason, testfn))
+ p.daemon = True
+ p.start()
+ p.join(5)
+ self.assertEqual(p.exitcode, code)
+
+ with open(testfn, 'r') as f:
+ self.assertEqual(f.read().rstrip(), str(reason))
+
+ for reason in (True, False, 8):
+ p = self.Process(target=sys.exit, args=(reason,))
+ p.daemon = True
+ p.start()
+ p.join(5)
+ self.assertEqual(p.exitcode, reason)
+
#
#
#