summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/tests/test_util.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-10-18 09:28:26 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-10-18 09:28:26 (GMT)
commit2b06d42db58e333ee932b5718ef2cb14b9ccfa91 (patch)
tree833cd8df0a668f2b119545417755b81346c00ef6 /Lib/distutils/tests/test_util.py
parent11abfe640fbfe37e7b5770ceebf21387e355951f (diff)
downloadcpython-2b06d42db58e333ee932b5718ef2cb14b9ccfa91.zip
cpython-2b06d42db58e333ee932b5718ef2cb14b9ccfa91.tar.gz
cpython-2b06d42db58e333ee932b5718ef2cb14b9ccfa91.tar.bz2
Changed distutils tests to avoid environment alteration
Diffstat (limited to 'Lib/distutils/tests/test_util.py')
-rw-r--r--Lib/distutils/tests/test_util.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index 7190b2c..4099c95 100644
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -121,7 +121,7 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase):
('Darwin Kernel Version 8.11.1: '
'Wed Oct 10 18:23:28 PDT 2007; '
'root:xnu-792.25.20~1/RELEASE_I386'), 'i386'))
- self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
+ os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.3'
get_config_vars()['CFLAGS'] = ('-fno-strict-aliasing -DNDEBUG -g '
'-fwrapv -O3 -Wall -Wstrict-prototypes')
@@ -129,7 +129,7 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase):
self.assertEquals(get_platform(), 'macosx-10.3-i386')
# macbook with fat binaries (fat, universal or fat64)
- self.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
+ os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.4'
get_config_vars()['CFLAGS'] = ('-arch ppc -arch i386 -isysroot '
'/Developer/SDKs/MacOSX10.4u.sdk '
'-fno-strict-aliasing -fno-common '
@@ -250,17 +250,18 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase):
def test_check_environ(self):
util._environ_checked = 0
+ if 'HOME' in os.environ:
+ del os.environ['HOME']
# posix without HOME
if os.name == 'posix': # this test won't run on windows
check_environ()
import pwd
- self.assertEquals(self.environ['HOME'],
- pwd.getpwuid(os.getuid())[5])
+ self.assertEquals(os.environ['HOME'], pwd.getpwuid(os.getuid())[5])
else:
check_environ()
- self.assertEquals(self.environ['PLAT'], get_platform())
+ self.assertEquals(os.environ['PLAT'], get_platform())
self.assertEquals(util._environ_checked, 1)
def test_split_quoted(self):