From: Ned Deily <nad@acm.org>
Date: Mon, 31 Oct 2011 23:14:52 +0000 (-0700)
Subject: Issue #13304: Skip test case if user site-packages disabled (-s or
X-Git-Tag: v2.7.3rc1~340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1aacd7bb027828471d8bcb88b0234ff8425695a5;p=thirdparty%2FPython%2Fcpython.git

Issue #13304: Skip test case if user site-packages disabled (-s or
PYTHONNOUSERSITE).  (Patch by Carl Meyer)
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 1988ef3a6c2f..9fd23fa13266 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 67570e3c2dea..97c961cb1257 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 119355d974dd..be64128776a8 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.