59 lines
2.7 KiB
Diff
59 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Victor Stinner <vstinner@python.org>
|
|
Date: Thu, 9 Sep 2021 11:02:48 +0200
|
|
Subject: [PATCH] 00367: bpo-44860: Update test_sysconfig for posix_user
|
|
platlib
|
|
|
|
Update test_sysconfig.test_user_similar() for the posix_user scheme:
|
|
"platlib" doesn't use sys.platlibdir.
|
|
---
|
|
Lib/test/pythoninfo.py | 1 +
|
|
Lib/test/test_sysconfig.py | 12 +++++++++++-
|
|
.../Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst | 2 ++
|
|
3 files changed, 14 insertions(+), 1 deletion(-)
|
|
create mode 100644 Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst
|
|
|
|
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
|
|
index 278dfe7f7d..39ee9e1d76 100644
|
|
--- a/Lib/test/pythoninfo.py
|
|
+++ b/Lib/test/pythoninfo.py
|
|
@@ -96,6 +96,7 @@ def collect_sys(info_add):
|
|
'maxunicode',
|
|
'path',
|
|
'platform',
|
|
+ 'platlibdir',
|
|
'prefix',
|
|
'thread_info',
|
|
'version',
|
|
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
|
|
index b8b9add36d..9408657c91 100644
|
|
--- a/Lib/test/test_sysconfig.py
|
|
+++ b/Lib/test/test_sysconfig.py
|
|
@@ -296,7 +296,17 @@ def test_user_similar(self):
|
|
base = base.replace(sys.base_prefix, sys.prefix)
|
|
if HAS_USER_BASE:
|
|
user_path = get_path(name, 'posix_user')
|
|
- self.assertEqual(user_path, global_path.replace(base, user, 1))
|
|
+ expected = global_path.replace(base, user, 1)
|
|
+ # bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
|
|
+ # whereas posix_prefix does.
|
|
+ if name == 'platlib':
|
|
+ # Replace "/lib64/python3.11/site-packages" suffix
|
|
+ # with "/lib/python3.11/site-packages".
|
|
+ py_version_short = sysconfig.get_python_version()
|
|
+ suffix = f'python{py_version_short}/site-packages'
|
|
+ expected = expected.replace(f'/{sys.platlibdir}/{suffix}',
|
|
+ f'/lib/{suffix}')
|
|
+ self.assertEqual(user_path, expected)
|
|
|
|
def test_main(self):
|
|
# just making sure _main() runs and returns things in the stdout
|
|
diff --git a/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst
|
|
new file mode 100644
|
|
index 0000000000..153a9c5573
|
|
--- /dev/null
|
|
+++ b/Misc/NEWS.d/next/Tests/2021-09-08-13-01-37.bpo-44860.qXd0kx.rst
|
|
@@ -0,0 +1,2 @@
|
|
+Update ``test_sysconfig.test_user_similar()`` for the posix_user scheme:
|
|
+``platlib`` doesn't use :data:`sys.platlibdir`. Patch by Victor Stinner.
|