mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "gh-103224: Use the realpath of the Python executable in test_venv (GH-103243)" (GH-108667)

Browse source 
This reverts commit 85b0b0cd94.

It broke builtbots.
This commit is contained in:
Serhiy Storchaka 2023-08-30 11:41:04 +03:00 • committed by GitHub
parent 24b9bdd6ea
commit 210a5d7b8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_venv.py
View file

@ -208,8 +208,7 @@ class BasicTest(BaseTest):
def test_upgrade_dependencies(self):
builder = venv.EnvBuilder()
bin_path = 'Scripts' if sys.platform == 'win32' else 'bin'
python_exe_realpath = os.path.realpath(sys._base_executable)
python_exe = os.path.split(python_exe_realpath)[1]
python_exe = os.path.split(sys.executable)[1]
with tempfile.TemporaryDirectory() as fake_env_dir:
expect_exe = os.path.normcase(
os.path.join(fake_env_dir, bin_path, python_exe)
@ -552,8 +551,7 @@ class BasicTest(BaseTest):
self.addCleanup(rmtree, non_installed_dir)
bindir = os.path.join(non_installed_dir, self.bindir)
os.mkdir(bindir)
python_exe_realpath = os.path.realpath(sys._base_executable)
shutil.copy2(python_exe_realpath, bindir)
shutil.copy2(sys.executable, bindir)
libdir = os.path.join(non_installed_dir, platlibdir, self.lib[1])
os.makedirs(libdir)
landmark = os.path.join(libdir, "os.py")
@ -597,7 +595,7 @@ class BasicTest(BaseTest):
# libpython.so
ld_library_path = sysconfig.get_config_var("LIBDIR")
if not ld_library_path or sysconfig.is_python_build():
ld_library_path = os.path.abspath(os.path.dirname(python_exe_realpath))
ld_library_path = os.path.abspath(os.path.dirname(sys.executable))
if sys.platform == 'darwin':
ld_library_path_env = "DYLD_LIBRARY_PATH"
else: