summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_script_helper.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2015-02-05 01:16:30 (GMT)
committerGregory P. Smith <greg@krypto.org>2015-02-05 01:16:30 (GMT)
commit7c60eb85d8e44216719dae0e4d8d1f90f24d00ad (patch)
tree93056ac7ce7a2e648cd7a20349d15eaf91f1ae97 /Lib/test/test_script_helper.py
parent82492826225b0216d9bde704a4b69584c4f31cc5 (diff)
parentc3493aa951ca8de2149518c743f1b023a5a714da (diff)
downloadcpython-7c60eb85d8e44216719dae0e4d8d1f90f24d00ad.zip
cpython-7c60eb85d8e44216719dae0e4d8d1f90f24d00ad.tar.gz
cpython-7c60eb85d8e44216719dae0e4d8d1f90f24d00ad.tar.bz2
Make the stdlib test suite helper test.script_helper._assert_python no longer
pass -I or -E to the child process by default when the environment is required for the child process interpreter to function properly.
Diffstat (limited to 'Lib/test/test_script_helper.py')
-rwxr-xr-xLib/test/test_script_helper.py33
1 files changed, 33 insertions, 0 deletions
diff --git a/Lib/test/test_script_helper.py b/Lib/test/test_script_helper.py
index a10e801..74333c9 100755
--- a/Lib/test/test_script_helper.py
+++ b/Lib/test/test_script_helper.py
@@ -33,6 +33,39 @@ class TestScriptHelper(unittest.TestCase):
self.assertIn('import sys; sys.exit(0)', error_msg,
msg='unexpected command line.')
+ @mock.patch('subprocess.Popen')
+ def test_assert_python_isolated_when_env_not_required(self, mock_popen):
+ with mock.patch.object(script_helper,
+ 'interpreter_requires_environment',
+ return_value=False) as mock_ire_func:
+ mock_popen.side_effect = RuntimeError('bail out of unittest')
+ try:
+ script_helper._assert_python(True, '-c', 'None')
+ except RuntimeError as err:
+ self.assertEqual('bail out of unittest', err.args[0])
+ self.assertEqual(1, mock_popen.call_count)
+ self.assertEqual(1, mock_ire_func.call_count)
+ popen_command = mock_popen.call_args[0][0]
+ self.assertEqual(sys.executable, popen_command[0])
+ self.assertIn('None', popen_command)
+ self.assertIn('-I', popen_command)
+ self.assertNotIn('-E', popen_command) # -I overrides this
+
+ @mock.patch('subprocess.Popen')
+ def test_assert_python_not_isolated_when_env_is_required(self, mock_popen):
+ """Ensure that -I is not passed when the environment is required."""
+ with mock.patch.object(script_helper,
+ 'interpreter_requires_environment',
+ return_value=True) as mock_ire_func:
+ mock_popen.side_effect = RuntimeError('bail out of unittest')
+ try:
+ script_helper._assert_python(True, '-c', 'None')
+ except RuntimeError as err:
+ self.assertEqual('bail out of unittest', err.args[0])
+ popen_command = mock_popen.call_args[0][0]
+ self.assertNotIn('-I', popen_command)
+ self.assertNotIn('-E', popen_command)
+
class TestScriptHelperEnvironment(unittest.TestCase):
"""Code coverage for interpreter_requires_environment()."""