summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-01-03 17:53:13 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-01-03 17:53:13 (GMT)
commit904fe042f3750df886e6a86aa660c1f047c9d0c5 (patch)
tree83d45050cc6690cad1165d484dc5e43dfd2ce1c1 /Lib
parent622eb174d2c211a972e26fcccf9e240f6f9e6af2 (diff)
downloadcpython-904fe042f3750df886e6a86aa660c1f047c9d0c5.zip
cpython-904fe042f3750df886e6a86aa660c1f047c9d0c5.tar.gz
cpython-904fe042f3750df886e6a86aa660c1f047c9d0c5.tar.bz2
Merged revisions 87691 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87691 | eric.araujo | 2011-01-03 18:51:11 +0100 (lun., 03 janv. 2011) | 2 lines Fix test_site for systems without unsetenv. Reported by Zsolt Cserna. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_site.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 081173d..6231a6b 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -154,12 +154,16 @@ class HelperFunctionsTests(unittest.TestCase):
usersite = site.USER_SITE
self.assertTrue(usersite in sys.path)
+ env = os.environ.copy()
rc = subprocess.call([sys.executable, '-c',
- 'import sys; sys.exit(%r in sys.path)' % usersite])
+ 'import sys; sys.exit(%r in sys.path)' % usersite],
+ env=env)
self.assertEqual(rc, 1)
+ env = os.environ.copy()
rc = subprocess.call([sys.executable, '-s', '-c',
- 'import sys; sys.exit(%r in sys.path)' % usersite])
+ 'import sys; sys.exit(%r in sys.path)' % usersite],
+ env=env)
self.assertEqual(rc, 0)
env = os.environ.copy()