http://hg.python.org/cpython/rev/c497011a4769 changeset: 73267:c497011a4769 branch: 3.2 parent: 73256:2ca415cbf2ac user: Ned Deily <nad@acm.org> date: Mon Oct 31 16:16:35 2011 -0700 summary: Issue #13304: Skip test case if user site-packages disabled (-s or PYTHONNOUSERSITE). (Patch by Carl Meyer) files: Lib/test/test_site.py | 4 +++- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -24,7 +24,7 @@ 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) @@ -157,6 +157,8 @@ 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 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -601,6 +601,7 @@ Ezio Melotti Brian Merrell Luke Mewburn +Carl Meyer Mike Meyer Steven Miale Trent Mick diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -187,6 +187,9 @@ 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. -- Repository URL: http://hg.python.org/cpython