cpython (merge 3.2 -> default): Issue #13304: Skip test case if user site-packages disabled (-s or

http://hg.python.org/cpython/rev/c343c095d08b changeset: 73268:c343c095d08b parent: 73265:3f025427f02b parent: 73267:c497011a4769 user: Ned Deily <nad@acm.org> date: Mon Oct 31 16:22:53 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/NEWS | 3 +++ 2 files changed, 6 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/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1523,6 +1523,9 @@ Tests ----- +- Issue #13304: Skip test case if user site-packages disabled (-s or + PYTHONNOUSERSITE). (Patch by Carl Meyer) + - Issue #5661: Add a test for ECONNRESET/EPIPE handling to test_asyncore. Patch by Xavier de Gaye. -- Repository URL: http://hg.python.org/cpython
participants (1)
-
ned.deily