traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-32942: Fix environment dependent test_script_helper (GH-8034) 

Result of function interpreter_requires_environment() depends on os.environ.
This was not covered by the tests, leading to fail when PYTHONHOME was set.
This commit is contained in:
Lorenz Mende 2018-07-04 12:10:15 +02:00 committed by Victor Stinner
parent 07888e1cce
commit a390cb6b6f
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Lib/test/test_script_helper.py
View File

@ -2,6 +2,7 @@
import subprocess import subprocess
import sys import sys
import os
from test.support import script_helper from test.support import script_helper
import unittest import unittest
from unittest import mock from unittest import mock
@ -73,7 +74,7 @@ class TestScriptHelperEnvironment(unittest.TestCase):
def setUp(self): def setUp(self):
self.assertTrue( self.assertTrue(
hasattr(script_helper, '__cached_interp_requires_environment')) hasattr(script_helper, '__cached_interp_requires_environment'))
# Reset the private cached state. # Reset the private cached state.
script_helper.__dict__['__cached_interp_requires_environment'] = None script_helper.__dict__['__cached_interp_requires_environment'] = None
@ -83,27 +84,41 @@ class TestScriptHelperEnvironment(unittest.TestCase):
@mock.patch('subprocess.check_call') @mock.patch('subprocess.check_call')
def test_interpreter_requires_environment_true(self, mock_check_call): def test_interpreter_requires_environment_true(self, mock_check_call):
mock_check_call.side_effect = subprocess.CalledProcessError('', '') with mock.patch.dict(os.environ):
self.assertTrue(script_helper.interpreter_requires_environment()) os.environ.pop('PYTHONHOME', None)
self.assertTrue(script_helper.interpreter_requires_environment()) mock_check_call.side_effect = subprocess.CalledProcessError('', '')
self.assertEqual(1, mock_check_call.call_count) self.assertTrue(script_helper.interpreter_requires_environment())
self.assertTrue(script_helper.interpreter_requires_environment())
self.assertEqual(1, mock_check_call.call_count)
@mock.patch('subprocess.check_call') @mock.patch('subprocess.check_call')
def test_interpreter_requires_environment_false(self, mock_check_call): def test_interpreter_requires_environment_false(self, mock_check_call):
# The mocked subprocess.check_call fakes a no-error process. with mock.patch.dict(os.environ):
script_helper.interpreter_requires_environment() os.environ.pop('PYTHONHOME', None)
self.assertFalse(script_helper.interpreter_requires_environment()) # The mocked subprocess.check_call fakes a no-error process.
self.assertEqual(1, mock_check_call.call_count) script_helper.interpreter_requires_environment()
self.assertFalse(script_helper.interpreter_requires_environment())
self.assertEqual(1, mock_check_call.call_count)
@mock.patch('subprocess.check_call') @mock.patch('subprocess.check_call')
def test_interpreter_requires_environment_details(self, mock_check_call): def test_interpreter_requires_environment_details(self, mock_check_call):
script_helper.interpreter_requires_environment() with mock.patch.dict(os.environ):
self.assertFalse(script_helper.interpreter_requires_environment()) os.environ.pop('PYTHONHOME', None)
self.assertFalse(script_helper.interpreter_requires_environment()) script_helper.interpreter_requires_environment()
self.assertEqual(1, mock_check_call.call_count) self.assertFalse(script_helper.interpreter_requires_environment())
check_call_command = mock_check_call.call_args[0][0] self.assertFalse(script_helper.interpreter_requires_environment())
self.assertEqual(sys.executable, check_call_command[0]) self.assertEqual(1, mock_check_call.call_count)
self.assertIn('-E', check_call_command) check_call_command = mock_check_call.call_args[0][0]
self.assertEqual(sys.executable, check_call_command[0])
self.assertIn('-E', check_call_command)
@mock.patch('subprocess.check_call')
def test_interpreter_requires_environment_with_pythonhome(self, mock_check_call):
with mock.patch.dict(os.environ):
os.environ['PYTHONHOME'] = 'MockedHome'
self.assertTrue(script_helper.interpreter_requires_environment())
self.assertTrue(script_helper.interpreter_requires_environment())
self.assertEqual(0, mock_check_call.call_count)
if __name__ == '__main__': if __name__ == '__main__':