Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-29763: Clean up _pth tests (GH-954)

This commit is contained in:
Zachary Ware 2017-05-14 15:49:46 -05:00 committed by GitHub
parent 9977629623
commit d48214f22c
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Lib/test/test_site.py
View File

@ -17,6 +17,7 @@ import urllib.error
import shutil
import subprocess
import sysconfig
import tempfile
from copy import copy
# These tests are not particularly useful if Python was invoked with -S.
@ -502,29 +503,21 @@ class StartupImportTests(unittest.TestCase):
'import site, sys; site.enablerlcompleter(); sys.exit(hasattr(sys, "__interactivehook__"))']).wait()
self.assertTrue(r, "'__interactivehook__' not added by enablerlcompleter()")
@classmethod
def _create_underpth_exe(self, lines):
exe_file = os.path.join(os.getenv('TEMP'), os.path.split(sys.executable)[1])
shutil.copy(sys.executable, exe_file)
@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows")
class _pthFileTests(unittest.TestCase):
def _create_underpth_exe(self, lines):
temp_dir = tempfile.mkdtemp()
self.addCleanup(test.support.rmtree, temp_dir)
exe_file = os.path.join(temp_dir, os.path.split(sys.executable)[1])
shutil.copy(sys.executable, exe_file)
_pth_file = os.path.splitext(exe_file)[0] + '._pth'
try:
with open(_pth_file, 'w') as f:
for line in lines:
print(line, file=f)
return exe_file
except:
test.support.unlink(_pth_file)
test.support.unlink(exe_file)
raise
@classmethod
def _cleanup_underpth_exe(self, exe_file):
_pth_file = os.path.splitext(exe_file)[0] + '._pth'
test.support.unlink(_pth_file)
test.support.unlink(exe_file)
@classmethod
def _calc_sys_path_for_underpth_nosite(self, sys_prefix, lines):
sys_path = []
for line in lines:
@ -534,7 +527,6 @@ class StartupImportTests(unittest.TestCase):
sys_path.append(abs_path)
return sys_path
@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows")
def test_underpth_nosite_file(self):
libpath = os.path.dirname(os.path.dirname(encodings.__file__))
exe_prefix = os.path.dirname(sys.executable)
@ -549,7 +541,6 @@ class StartupImportTests(unittest.TestCase):
os.path.dirname(exe_file),
pth_lines)
try:
env = os.environ.copy()
env['PYTHONPATH'] = 'from-env'
env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH'))
@ -558,11 +549,8 @@ class StartupImportTests(unittest.TestCase):
'len(sys.path) > 200 and '
'sys.path == %r)' % sys_path,
], env=env)
finally:
self._cleanup_underpth_exe(exe_file)
self.assertTrue(rc, "sys.path is incorrect")
@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows")
def test_underpth_file(self):
libpath = os.path.dirname(os.path.dirname(encodings.__file__))
exe_prefix = os.path.dirname(sys.executable)
@ -574,7 +562,6 @@ class StartupImportTests(unittest.TestCase):
'import site'
])
sys_prefix = os.path.dirname(exe_file)
try:
env = os.environ.copy()
env['PYTHONPATH'] = 'from-env'
env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH'))
@ -586,8 +573,6 @@ class StartupImportTests(unittest.TestCase):
libpath,
os.path.join(sys_prefix, 'from-env'),
)], env=env)
finally:
self._cleanup_underpth_exe(exe_file)
self.assertTrue(rc, "sys.path is incorrect")