From 1aacd7bb027828471d8bcb88b0234ff8425695a5 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Mon, 31 Oct 2011 16:14:52 -0700 Subject: [PATCH] Issue #13304: Skip test case if user site-packages disabled (-s or PYTHONNOUSERSITE). (Patch by Carl Meyer) --- Lib/test/test_site.py | 4 +++- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 1988ef3a6c..9fd23fa132 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -24,7 +24,7 @@ if "site" in sys.modules: else: raise unittest.SkipTest("importation of site.py suppressed") -if not os.path.isdir(site.USER_SITE): +if site.ENABLE_USER_SITE and not os.path.isdir(site.USER_SITE): # need to add user site directory for tests os.makedirs(site.USER_SITE) site.addsitedir(site.USER_SITE) @@ -161,6 +161,8 @@ class HelperFunctionsTests(unittest.TestCase): finally: pth_file.cleanup() + @unittest.skipUnless(site.ENABLE_USER_SITE, "requires access to PEP 370 " + "user-site (site.ENABLE_USER_SITE)") def test_s_option(self): usersite = site.USER_SITE self.assertIn(usersite, sys.path) diff --git a/Misc/ACKS b/Misc/ACKS index 67570e3c2d..97c961cb12 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -556,6 +556,7 @@ Lucas Prado Melo Ezio Melotti Brian Merrell Luke Mewburn +Carl Meyer Mike Meyer Steven Miale Trent Mick diff --git a/Misc/NEWS b/Misc/NEWS index 119355d974..be64128776 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -328,6 +328,9 @@ Tools/Demos Tests ----- +- Issue #13304: Skip test case if user site-packages disabled (-s or + PYTHONNOUSERSITE). (Patch by Carl Meyer) + - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. - Issue #12821: Fix test_fcntl failures on OpenBSD 5. -- 2.50.1