diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2013-09-01 08:22:41 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2013-09-01 08:22:41 (GMT) |
| commit | f6fa22efe0fbc726583ec268a80fdb671b148b2c (patch) | |
| tree | d61564ca3bc313f08c062ea0fa215c739df330c6 /Lib/test/test_subprocess.py | |
| parent | 8913a6c83dd34300f4a13950036b01c0e2cad1b0 (diff) | |
| download | cpython-f6fa22efe0fbc726583ec268a80fdb671b148b2c.zip cpython-f6fa22efe0fbc726583ec268a80fdb671b148b2c.tar.gz cpython-f6fa22efe0fbc726583ec268a80fdb671b148b2c.tar.bz2 | |
Issue #18571: Merge duplicate test code
Merge test/subprocessdata/inherited.py into test/subprocessdata/fd_status.py
Diffstat (limited to 'Lib/test/test_subprocess.py')
| -rw-r--r-- | Lib/test/test_subprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 94d72dc..c00fc5c 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1926,7 +1926,7 @@ class POSIXProcessTestCase(BaseTestCase): self.assertIn('overriding close_fds', str(context.warning)) def test_pass_fds_inheritable(self): - script = support.findfile("inherited.py", subdir="subprocessdata") + script = support.findfile("fd_status.py", subdir="subprocessdata") inheritable, non_inheritable = os.pipe() self.addCleanup(os.close, inheritable) @@ -1945,7 +1945,7 @@ class POSIXProcessTestCase(BaseTestCase): # the inheritable file descriptor must be inherited, so its inheritable # flag must be set in the child process after fork() and before exec() - self.assertEqual(fds, set(pass_fds)) + self.assertEqual(fds, set(pass_fds), "output=%a" % output) # inheritable flag must not be changed in the parent process self.assertEqual(os.get_inheritable(inheritable), True) |