Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(tests): do not use hard-coded paths in tests (#1834)

Browse Source 
* chore(tests): do not use hard-coded paths in tests

* review suggestion

use `os.path.samefile` rather than comparing `os.stat` directly.
This commit is contained in:
Matthieu Darbois
2024-05-26 12:40:11 +02:00
committed by GitHub
parent ba8be0d988
commit 67ee9dda92
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_before_build.py
+12 -18
View File
@@ -14,26 +14,21 @@ project_with_before_build_asserts = test_projects.new_c_project(
# assert that the Python version as written to pythonversion_bb.txt in the CIBW_BEFORE_BUILD step
# is the same one as is currently running.
version_file = 'c:\\pythonversion_bb.txt' if sys.platform == 'win32' else '/tmp/pythonversion_bb.txt'
with open(version_file) as f:
with open('pythonversion_bb.txt') as f:
stored_version = f.read()
print('stored_version', stored_version)
print('sys.version', sys.version)
assert stored_version == sys.version
# check that the executable also was written
executable_file = 'c:\\pythonexecutable_bb.txt' if sys.platform == 'win32' else '/tmp/pythonexecutable_bb.txt'
with open(executable_file) as f:
stored_executable = f.read()
print('stored_executable', stored_executable)
print('sys.executable', sys.executable)
# check that the prefix also was written
with open('pythonprefix_bb.txt') as f:
stored_prefix = f.read()
print('stored_prefix', stored_prefix)
print('sys.prefix', sys.prefix)
# Works around path-comparison bugs caused by short-paths on Windows e.g.
# vssadm~1 instead of vssadministrator
# windows/mac are case insensitive
stored_path = os.path.realpath(stored_executable).lower()
current_path = os.path.realpath(sys.executable).lower()
# TODO: This is not valid in an virtual environment
assert stored_path == current_path, '{0} != {1}'.format(stored_path, current_path)
assert os.path.samefile(stored_prefix, sys.prefix)
"""
)
)
@@ -44,8 +39,8 @@ def test(tmp_path):
project_with_before_build_asserts.generate(project_dir)
before_build = (
"""python -c "import sys; open('{output_dir}pythonversion_bb.txt', 'w').write(sys.version)" && """
'''python -c "import sys; open('{output_dir}pythonexecutable_bb.txt', 'w').write(sys.executable)"'''
"""python -c "import sys; open('{project}/pythonversion_bb.txt', 'w').write(sys.version)" && """
'''python -c "import sys; open('{project}/pythonprefix_bb.txt', 'w').write(sys.prefix)"'''
)
# build the wheels
@@ -54,8 +49,7 @@ def test(tmp_path):
add_env={
# write python version information to a temporary file, this is
# checked in setup.py
"CIBW_BEFORE_BUILD": before_build.format(output_dir="/tmp/"),
"CIBW_BEFORE_BUILD_WINDOWS": before_build.format(output_dir=r"c:\\"),
"CIBW_BEFORE_BUILD": before_build,
},
)