]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] GH-77403: Fix tests which fail when PYTHONUSERBASE is not normalized (GH-93917...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 30 Jun 2022 09:47:16 +0000 (02:47 -0700)
committerGitHub <noreply@github.com>
Thu, 30 Jun 2022 09:47:16 +0000 (02:47 -0700)
(cherry picked from commit b1ae4af5e82e7275cebcfb383690b816a388a785)

Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Automerge-Triggered-By: GH:iritkatriel
Lib/test/test_site.py
Lib/test/test_sysconfig.py

index 9a148fe2f4e98cdbc5b7e10bef4aa9f84edb2255..b5dc381a2f3bba6fad4d87298ef7bc61fa2b027f 100644 (file)
@@ -206,7 +206,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 "
@@ -214,7 +214,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()
index 1679700f59296f97cc2a447f1298391d5e1c36bc..83b492e9219ac1b598536677ced7b5e9be1bf2b7 100644 (file)
@@ -370,7 +370,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':