mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Issue #25654:
* multiprocessing: open file with closefd=False to avoid ResourceWarning * _test_multiprocessing: open file with O_EXCL to detect bugs in tests (if a previous test forgot to remove TESTFN) * test_sys_exit(): remove TESTFN after each loop iteration Initial patch written by Serhiy Storchaka.
This commit is contained in:
parent
47b4557679
commit
a6d865c128
5 changed files with 39 additions and 19 deletions
|
@ -455,13 +455,15 @@ class _TestSubclassingProcess(BaseTestCase):
|
|||
|
||||
@classmethod
|
||||
def _test_stderr_flush(cls, testfn):
|
||||
sys.stderr = open(testfn, 'w')
|
||||
fd = os.open(testfn, os.O_WRONLY | os.O_CREAT | os.O_EXCL)
|
||||
sys.stderr = open(fd, 'w', closefd=False)
|
||||
1/0 # MARKER
|
||||
|
||||
|
||||
@classmethod
|
||||
def _test_sys_exit(cls, reason, testfn):
|
||||
sys.stderr = open(testfn, 'w')
|
||||
fd = os.open(testfn, os.O_WRONLY | os.O_CREAT | os.O_EXCL)
|
||||
sys.stderr = open(fd, 'w', closefd=False)
|
||||
sys.exit(reason)
|
||||
|
||||
def test_sys_exit(self):
|
||||
|
@ -472,15 +474,21 @@ class _TestSubclassingProcess(BaseTestCase):
|
|||
testfn = test.support.TESTFN
|
||||
self.addCleanup(test.support.unlink, testfn)
|
||||
|
||||
for reason, code in (([1, 2, 3], 1), ('ignore this', 1)):
|
||||
for reason in (
|
||||
[1, 2, 3],
|
||||
'ignore this',
|
||||
):
|
||||
p = self.Process(target=self._test_sys_exit, args=(reason, testfn))
|
||||
p.daemon = True
|
||||
p.start()
|
||||
p.join(5)
|
||||
self.assertEqual(p.exitcode, code)
|
||||
self.assertEqual(p.exitcode, 1)
|
||||
|
||||
with open(testfn, 'r') as f:
|
||||
self.assertEqual(f.read().rstrip(), str(reason))
|
||||
content = f.read()
|
||||
self.assertEqual(content.rstrip(), str(reason))
|
||||
|
||||
os.unlink(testfn)
|
||||
|
||||
for reason in (True, False, 8):
|
||||
p = self.Process(target=sys.exit, args=(reason,))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue