Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #13304: Skip test case if user site-packages disabled (-s or 

PYTHONNOUSERSITE).  (Patch by Carl Meyer)
This commit is contained in:
Ned Deily 2011-10-31 16:16:35 -07:00
parent ce260142c6
commit 316f573d9c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_site.py
View File

@ -24,7 +24,7 @@ if "site" in sys.modules:
else: else:
raise unittest.SkipTest("importation of site.py suppressed") 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 # need to add user site directory for tests
os.makedirs(site.USER_SITE) os.makedirs(site.USER_SITE)
site.addsitedir(site.USER_SITE) site.addsitedir(site.USER_SITE)
@ -157,6 +157,8 @@ class HelperFunctionsTests(unittest.TestCase):
finally: finally:
pth_file.cleanup() 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): def test_s_option(self):
usersite = site.USER_SITE usersite = site.USER_SITE
self.assertIn(usersite, sys.path) self.assertIn(usersite, sys.path)

1
Misc/ACKS
View File

@ -601,6 +601,7 @@ Lucas Prado Melo
Ezio Melotti Ezio Melotti
Brian Merrell Brian Merrell
Luke Mewburn Luke Mewburn
Carl Meyer
Mike Meyer Mike Meyer
Steven Miale Steven Miale
Trent Mick Trent Mick

3
Misc/NEWS
View File

@ -187,6 +187,9 @@ Library
Tests 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 #13218: Fix test_ssl failures on Debian/Ubuntu.
- Issue #12821: Fix test_fcntl failures on OpenBSD 5. - Issue #12821: Fix test_fcntl failures on OpenBSD 5.