From 641b1de2afece39c3a18f42d5eb5c8708f559aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Fri, 2 Oct 2009 22:37:51 +0000 Subject: [PATCH] fixed the distutils tests that were not writing in temp --- Lib/distutils/tests/test_config.py | 10 +++---- Lib/distutils/tests/test_sdist.py | 42 ++++++++++++++---------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index cae7689884f..23291da8196 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -49,13 +49,14 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase): def setUp(self): """Patches the environment.""" + super(PyPIRCCommandTestCase, self).setUp() if os.environ.has_key('HOME'): self._old_home = os.environ['HOME'] else: self._old_home = None - curdir = os.path.dirname(__file__) - os.environ['HOME'] = curdir - self.rc = os.path.join(curdir, '.pypirc') + tempdir = self.mkdtemp() + os.environ['HOME'] = tempdir + self.rc = os.path.join(tempdir, '.pypirc') self.dist = Distribution() class command(PyPIRCCommand): @@ -74,9 +75,8 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase): del os.environ['HOME'] else: os.environ['HOME'] = self._old_home - if os.path.exists(self.rc): - os.remove(self.rc) set_threshold(self.old_threshold) + super(PyPIRCCommandTestCase, self).tearDown() def test_server_registration(self): # This test makes sure PyPIRCCommand knows how to: diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index 59c24fd4338..e322c1385c6 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -12,9 +12,6 @@ from distutils.tests.test_config import PyPIRCCommandTestCase from distutils.errors import DistutilsExecError from distutils.spawn import find_executable -CURDIR = os.path.dirname(__file__) -TEMP_PKG = join(CURDIR, 'temppkg') - SETUP_PY = """ from distutils.core import setup import somecode @@ -31,25 +28,24 @@ class sdistTestCase(PyPIRCCommandTestCase): def setUp(self): super(sdistTestCase, self).setUp() self.old_path = os.getcwd() + self.temp_pkg = os.path.join(self.mkdtemp(), 'temppkg') def tearDown(self): os.chdir(self.old_path) - if os.path.exists(TEMP_PKG): - shutil.rmtree(TEMP_PKG) super(sdistTestCase, self).tearDown() def _init_tmp_pkg(self): - if os.path.exists(TEMP_PKG): - shutil.rmtree(TEMP_PKG) - os.mkdir(TEMP_PKG) - os.mkdir(join(TEMP_PKG, 'somecode')) - os.mkdir(join(TEMP_PKG, 'dist')) + if os.path.exists(self.temp_pkg): + shutil.rmtree(self.temp_pkg) + os.mkdir(self.temp_pkg) + os.mkdir(join(self.temp_pkg, 'somecode')) + os.mkdir(join(self.temp_pkg, 'dist')) # creating a MANIFEST, a package, and a README - self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN) - self._write(join(TEMP_PKG, 'README'), 'xxx') - self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#') - self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY) - os.chdir(TEMP_PKG) + self._write(join(self.temp_pkg, 'MANIFEST.in'), MANIFEST_IN) + self._write(join(self.temp_pkg, 'README'), 'xxx') + self._write(join(self.temp_pkg, 'somecode', '__init__.py'), '#') + self._write(join(self.temp_pkg, 'setup.py'), SETUP_PY) + os.chdir(self.temp_pkg) def _write(self, path, content): f = open(path, 'w') @@ -65,15 +61,15 @@ class sdistTestCase(PyPIRCCommandTestCase): self._init_tmp_pkg() # creating VCS directories with some files in them - os.mkdir(join(TEMP_PKG, 'somecode', '.svn')) - self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx') + os.mkdir(join(self.temp_pkg, 'somecode', '.svn')) + self._write(join(self.temp_pkg, 'somecode', '.svn', 'ok.py'), 'xxx') - os.mkdir(join(TEMP_PKG, 'somecode', '.hg')) - self._write(join(TEMP_PKG, 'somecode', '.hg', + os.mkdir(join(self.temp_pkg, 'somecode', '.hg')) + self._write(join(self.temp_pkg, 'somecode', '.hg', 'ok'), 'xxx') - os.mkdir(join(TEMP_PKG, 'somecode', '.git')) - self._write(join(TEMP_PKG, 'somecode', '.git', + os.mkdir(join(self.temp_pkg, 'somecode', '.git')) + self._write(join(self.temp_pkg, 'somecode', '.git', 'ok'), 'xxx') # now building a sdist @@ -96,7 +92,7 @@ class sdistTestCase(PyPIRCCommandTestCase): cmd.run() # now let's check what we have - dist_folder = join(TEMP_PKG, 'dist') + dist_folder = join(self.temp_pkg, 'dist') files = os.listdir(dist_folder) self.assertEquals(files, ['fake-1.0.zip']) @@ -137,7 +133,7 @@ class sdistTestCase(PyPIRCCommandTestCase): cmd.run() # making sure we have two files - dist_folder = join(TEMP_PKG, 'dist') + dist_folder = join(self.temp_pkg, 'dist') result = os.listdir(dist_folder) result.sort() self.assertEquals(result,