mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

(cherry picked from commit b1ae4af5e8)


Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>

Automerge-Triggered-By: GH:iritkatriel
This commit is contained in:
Miss Islington (bot) 2022-06-30 02:48:13 -07:00 committed by GitHub
parent ee937571e7
commit 226fdce45d
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,14 +205,14 @@ def test_get_path(self):
scheme = 'osx_framework_user' scheme = 'osx_framework_user'
else: else:
scheme = os.name + '_user' 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)) sysconfig.get_path('purelib', scheme))
@unittest.skipUnless(site.ENABLE_USER_SITE, "requires access to PEP 370 " @unittest.skipUnless(site.ENABLE_USER_SITE, "requires access to PEP 370 "
"user-site (site.ENABLE_USER_SITE)") "user-site (site.ENABLE_USER_SITE)")
def test_s_option(self): def test_s_option(self):
# (ncoghlan) Change this to use script_helper... # (ncoghlan) Change this to use script_helper...
usersite = site.USER_SITE usersite = os.path.normpath(site.USER_SITE)
self.assertIn(usersite, sys.path) self.assertIn(usersite, sys.path)
env = os.environ.copy() env = os.environ.copy()

2
Lib/test/test_sysconfig.py
View File

@ -296,7 +296,7 @@ def test_user_similar(self):
base = base.replace(sys.base_prefix, sys.prefix) base = base.replace(sys.base_prefix, sys.prefix)
if HAS_USER_BASE: if HAS_USER_BASE:
user_path = get_path(name, 'posix_user') 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, # bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
# whereas posix_prefix does. # whereas posix_prefix does.
if name == 'platlib': if name == 'platlib':