1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-77403: Fix tests which fail when PYTHONUSERBASE is not normalized (GH-93917)

Browse Source
This commit is contained in:
Irit Katriel 2022-06-17 23:28:23 +01:00 committed by GitHub
parent 71354adff0
commit b1ae4af5e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_site.py
View File

@ -205,7 +205,7 @@ class HelperFunctionsTests(unittest.TestCase):
scheme = 'osx_framework_user'
else:
scheme = os.name + '_user'
self.assertEqual(site._get_path(site._getuserbase()),
self.assertEqual(os.path.normpath(site._get_path(site._getuserbase())),
sysconfig.get_path('purelib', scheme))
@unittest.skipUnless(site.ENABLE_USER_SITE, "requires access to PEP 370 "
@ -213,7 +213,7 @@ class HelperFunctionsTests(unittest.TestCase):
@support.requires_subprocess()
def test_s_option(self):
# (ncoghlan) Change this to use script_helper...
usersite = site.USER_SITE
usersite = os.path.normpath(site.USER_SITE)
self.assertIn(usersite, sys.path)
env = os.environ.copy()

2
Lib/test/test_sysconfig.py
View File

@ -369,7 +369,7 @@ class TestSysConfig(unittest.TestCase):
base = base.replace(sys.base_prefix, sys.prefix)
if HAS_USER_BASE:
user_path = get_path(name, 'posix_user')
expected = global_path.replace(base, user, 1)
expected = os.path.normpath(global_path.replace(base, user, 1))
# bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
# whereas posix_prefix does.
if name == 'platlib':