diff options
Diffstat (limited to 'Lib/test/test_site.py')
| -rw-r--r-- | Lib/test/test_site.py | 77 |
1 files changed, 31 insertions, 46 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 4029617..3aa46df 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -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 + +@unittest.skipUnless(sys.platform == 'win32', "only supported on Windows") +class _pthFileTests(unittest.TestCase): + def _create_underpth_exe(self, lines): - exe_file = os.path.join(os.getenv('TEMP'), os.path.split(sys.executable)[1]) + 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) + with open(_pth_file, 'w') as f: + for line in lines: + print(line, file=f) + return 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,20 +541,16 @@ 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')) - rc = subprocess.call([exe_file, '-c', - 'import sys; sys.exit(sys.flags.no_site and ' - 'len(sys.path) > 200 and ' - 'sys.path == %r)' % sys_path, - ], env=env) - finally: - self._cleanup_underpth_exe(exe_file) + env = os.environ.copy() + env['PYTHONPATH'] = 'from-env' + env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH')) + rc = subprocess.call([exe_file, '-c', + 'import sys; sys.exit(sys.flags.no_site and ' + 'len(sys.path) > 200 and ' + 'sys.path == %r)' % sys_path, + ], env=env) 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,20 +562,17 @@ 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')) - rc = subprocess.call([exe_file, '-c', - 'import sys; sys.exit(not sys.flags.no_site and ' - '%r in sys.path and %r in sys.path and %r not in sys.path and ' - 'all("\\r" not in p and "\\n" not in p for p in sys.path))' % ( - os.path.join(sys_prefix, 'fake-path-name'), - libpath, - os.path.join(sys_prefix, 'from-env'), - )], env=env) - finally: - self._cleanup_underpth_exe(exe_file) + env = os.environ.copy() + env['PYTHONPATH'] = 'from-env' + env['PATH'] = '{};{}'.format(exe_prefix, os.getenv('PATH')) + rc = subprocess.call([exe_file, '-c', + 'import sys; sys.exit(not sys.flags.no_site and ' + '%r in sys.path and %r in sys.path and %r not in sys.path and ' + 'all("\\r" not in p and "\\n" not in p for p in sys.path))' % ( + os.path.join(sys_prefix, 'fake-path-name'), + libpath, + os.path.join(sys_prefix, 'from-env'), + )], env=env) self.assertTrue(rc, "sys.path is incorrect") |