From 513c4f8fdd663fc4e85b6da4fdbaf466c137d0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Mon, 3 Jan 2011 17:57:29 +0000 Subject: [PATCH] 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. ........ --- Lib/test/test_site.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 69349e18570..1988ef3a6c2 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -165,13 +165,17 @@ class HelperFunctionsTests(unittest.TestCase): usersite = site.USER_SITE self.assertIn(usersite, 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, "%r is not in sys.path (sys.exit returned %r)" % (usersite, rc)) + 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()