mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

Merged revisions 72543 via svnmerge from

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

........
  r72543 | tarek.ziade | 2009-05-10 14:17:30 +0200 (Sun, 10 May 2009) | 1 line

  now using EnvironGuard everywhere
........
This commit is contained in:
Tarek Ziadé 2009-05-10 12:20:44 +00:00
parent 29bbb9618d
commit bbf1f18079
3 changed files with 25 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/distutils/tests/test_dist.py
View file

@ -38,11 +38,13 @@ class TestDistribution(distutils.dist.Distribution):
class DistributionTestCase(unittest.TestCase):
def setUp(self):
super(DistributionTestCase, self).setUp()
self.argv = sys.argv[:]
del sys.argv[1:]
def tearDown(self):
sys.argv[:] = self.argv
super(DistributionTestCase, self).tearDown()
def create_distribution(self, configfiles=()):
d = TestDistribution()
@ -121,7 +123,8 @@ class DistributionTestCase(unittest.TestCase):
self.assertEquals(len(warns), 0)
class MetadataTestCase(support.TempdirManager, unittest.TestCase):
class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
unittest.TestCase):
def test_simple_metadata(self):
attrs = {"name": "package",
@ -208,13 +211,6 @@ class MetadataTestCase(support.TempdirManager, unittest.TestCase):
def test_custom_pydistutils(self):
# fixes #2166
# make sure pydistutils.cfg is found
old = {}
for env in ('HOME', 'HOMEPATH', 'HOMEDRIVE'):
value = os.environ.get(env)
old[env] = value
if value is not None:
del os.environ[env]
if os.name == 'posix':
user_filename = ".pydistutils.cfg"
else:
@ -231,22 +227,18 @@ class MetadataTestCase(support.TempdirManager, unittest.TestCase):
# linux-style
if sys.platform in ('linux', 'darwin'):
os.environ['HOME'] = temp_dir
self.environ['HOME'] = temp_dir
files = dist.find_config_files()
self.assert_(user_filename in files)
# win32-style
if sys.platform == 'win32':
# home drive should be found
os.environ['HOME'] = temp_dir
self.environ['HOME'] = temp_dir
files = dist.find_config_files()
self.assert_(user_filename in files,
'%r not found in %r' % (user_filename, files))
finally:
for key, value in old.items():
if value is None:
continue
os.environ[key] = value
os.remove(user_filename)
def test_suite():