From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Fri, 17 Jun 2022 22:28:23 +0000 (+0100)
Subject: GH-77403: Fix tests which fail when PYTHONUSERBASE is not normalized (GH-93917)
X-Git-Tag: v3.12.0a1~1217
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1ae4af5e82e7275cebcfb383690b816a388a785;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index e66a2db7e9b3..6822579ad2a5 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -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()
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index c00d7d5b5024..27722fbe11ee 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -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':