diff options
| author | Gregory P. Smith <greg@krypto.org> | 2019-10-12 20:24:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 20:24:56 (GMT) |
| commit | f3751efb5c8b53b37efbbf75d9422c1d11c01646 (patch) | |
| tree | 2e650d45ee4a530df31c2b66d9457d11e6996f33 /Lib/test | |
| parent | 8177404d520e81f16324a900f093adf3856d33f8 (diff) | |
| download | cpython-f3751efb5c8b53b37efbbf75d9422c1d11c01646.zip cpython-f3751efb5c8b53b37efbbf75d9422c1d11c01646.tar.gz cpython-f3751efb5c8b53b37efbbf75d9422c1d11c01646.tar.bz2 | |
bpo-38417: Add umask support to subprocess (GH-16726)
On POSIX systems, allow the umask to be set in the child process before we exec.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_capi.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_subprocess.py | 26 |
2 files changed, 27 insertions, 5 deletions
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 6731447..2024435 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -97,7 +97,7 @@ class CAPITest(unittest.TestCase): def __len__(self): return 1 self.assertRaises(TypeError, _posixsubprocess.fork_exec, - 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) + 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) # Issue #15736: overflow in _PySequence_BytesToCharpArray() class Z(object): def __len__(self): @@ -105,7 +105,7 @@ class CAPITest(unittest.TestCase): def __getitem__(self, i): return b'x' self.assertRaises(MemoryError, _posixsubprocess.fork_exec, - 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) + 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) @unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.') def test_subprocess_fork_exec(self): @@ -115,7 +115,7 @@ class CAPITest(unittest.TestCase): # Issue #15738: crash in subprocess_fork_exec() self.assertRaises(TypeError, _posixsubprocess.fork_exec, - Z(),[b'1'],3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20) + Z(),[b'1'],3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21) @unittest.skipIf(MISSING_C_DOCSTRINGS, "Signature information for builtins requires docstrings") diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 2251640..5cc324b 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1894,6 +1894,28 @@ class POSIXProcessTestCase(BaseTestCase): with self.assertRaises(ValueError): subprocess.check_call([sys.executable, "-c", "pass"], extra_groups=[]) + @unittest.skipIf(mswindows or not hasattr(os, 'umask'), + 'POSIX umask() is not available.') + def test_umask(self): + tmpdir = None + try: + tmpdir = tempfile.mkdtemp() + name = os.path.join(tmpdir, "beans") + # We set an unusual umask in the child so as a unique mode + # for us to test the child's touched file for. + subprocess.check_call( + [sys.executable, "-c", f"open({name!r}, 'w')"], # touch + umask=0o053) + # Ignore execute permissions entirely in our test, + # filesystems could be mounted to ignore or force that. + st_mode = os.stat(name).st_mode & 0o666 + expected_mode = 0o624 + self.assertEqual(expected_mode, st_mode, + msg=f'{oct(expected_mode)} != {oct(st_mode)}') + finally: + if tmpdir is not None: + shutil.rmtree(tmpdir) + def test_run_abort(self): # returncode handles signal termination with support.SuppressCrashReport(): @@ -2950,7 +2972,7 @@ class POSIXProcessTestCase(BaseTestCase): -1, -1, -1, -1, 1, 2, 3, 4, True, True, - False, [], 0, + False, [], 0, -1, func) # Attempt to prevent # "TypeError: fork_exec() takes exactly N arguments (M given)" @@ -2999,7 +3021,7 @@ class POSIXProcessTestCase(BaseTestCase): -1, -1, -1, -1, 1, 2, 3, 4, True, True, - None, None, None, + None, None, None, -1, None) self.assertIn('fds_to_keep', str(c.exception)) finally: |