Merged revisions 72500 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72500 | tarek.ziade | 2009-05-09 12:06:00 +0200 (Sat, 09 May 2009) | 1 line

  #5976: fixed distutils test_check_environ
........
This commit is contained in:
Tarek Ziadé 2009-05-09 10:09:11 +00:00
parent 44b345460a
commit be5b1b9973
2 changed files with 13 additions and 6 deletions

View file

@ -214,12 +214,17 @@ class utilTestCase(unittest.TestCase):
# posix without HOME
if os.name == 'posix': # this test won't run on windows
os.environ = {}
check_environ()
import pwd
self.assertEquals(os.environ['HOME'],
pwd.getpwuid(os.getuid())[5])
old_home = os.environ.get('HOME')
try:
check_environ()
import pwd
self.assertEquals(os.environ['HOME'],
pwd.getpwuid(os.getuid())[5])
finally:
if old_home is not None:
os.environ['HOME'] = old_home
else:
del os.environ['HOME']
else:
check_environ()