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

[miss-islington]

https://github.com/python/cpython/commit/226fdce45d217d6e9375d784d1e6aba00c7c491c
commit: 226fdce45d217d6e9375d784d1e6aba00c7c491c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: miss-islington <31488909+miss-islington at users.noreply.github.com>
date: 2022-06-30T02:48:13-07:00
summary:

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



(cherry picked from commit b1ae4af5e82e7275cebcfb383690b816a388a785)


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

Automerge-Triggered-By: GH:iritkatriel

files:
M Lib/test/test_site.py
M Lib/test/test_sysconfig.py

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index aff3db5d9f49f..93349ed8bb16a 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -205,14 +205,14 @@ def test_get_path(self):
             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 "
                           "user-site (site.ENABLE_USER_SITE)")
     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 9408657c91886..5ee9839c0487d 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -296,7 +296,7 @@ def test_user_similar(self):
                 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':