diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-05-10 12:20:44 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-05-10 12:20:44 (GMT) |
commit | bbf1f18079c249da72d55f676ffdeeb9e5c882d1 (patch) | |
tree | e22b9a0698a2fe81c34445ede43cb8b2b8b9024c /Lib/distutils/tests/test_config.py | |
parent | 29bbb9618da442f4b4c0cc19a4d68b0b24531e24 (diff) | |
download | cpython-bbf1f18079c249da72d55f676ffdeeb9e5c882d1.zip cpython-bbf1f18079c249da72d55f676ffdeeb9e5c882d1.tar.gz cpython-bbf1f18079c249da72d55f676ffdeeb9e5c882d1.tar.bz2 |
Merged revisions 72543 via svnmerge from
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
........
Diffstat (limited to 'Lib/distutils/tests/test_config.py')
-rw-r--r-- | Lib/distutils/tests/test_config.py | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index 7506f93..0f97cf7 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -48,18 +48,14 @@ password:xxx class PyPIRCCommandTestCase(support.TempdirManager, support.LoggingSilencer, + support.EnvironGuard, unittest.TestCase): def setUp(self): """Patches the environment.""" super(PyPIRCCommandTestCase, self).setUp() - - if 'HOME' in os.environ: - self._old_home = os.environ['HOME'] - else: - self._old_home = None self.tmp_dir = self.mkdtemp() - os.environ['HOME'] = self.tmp_dir + self.environ['HOME'] = self.tmp_dir self.rc = os.path.join(self.tmp_dir, '.pypirc') self.dist = Distribution() @@ -75,10 +71,6 @@ class PyPIRCCommandTestCase(support.TempdirManager, def tearDown(self): """Removes the patch.""" - if self._old_home is None: - del os.environ['HOME'] - else: - os.environ['HOME'] = self._old_home set_threshold(self.old_threshold) super(PyPIRCCommandTestCase, self).tearDown() @@ -88,12 +80,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, # 2. handle the old format # new format - f = open(self.rc, 'w') - try: - f.write(PYPIRC) - finally: - f.close() - + self.write_file(self.rc, PYPIRC) cmd = self._cmd(self.dist) config = cmd._read_pypirc() @@ -104,10 +91,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, self.assertEquals(config, waited) # old format - f = open(self.rc, 'w') - f.write(PYPIRC_OLD) - f.close() - + self.write_file(self.rc, PYPIRC_OLD) config = cmd._read_pypirc() config = list(sorted(config.items())) waited = [('password', 'secret'), ('realm', 'pypi'), @@ -116,19 +100,14 @@ class PyPIRCCommandTestCase(support.TempdirManager, self.assertEquals(config, waited) def test_server_empty_registration(self): - cmd = self._cmd(self.dist) rc = cmd._get_rc_file() self.assert_(not os.path.exists(rc)) - cmd._store_pypirc('tarek', 'xxx') - self.assert_(os.path.exists(rc)) content = open(rc).read() - self.assertEquals(content, WANTED) - def test_suite(): return unittest.makeSuite(PyPIRCCommandTestCase) |