mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-20 16:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

fixed the distutils tests that were not writing in temp

Browse source
This commit is contained in:
Tarek Ziadé 2009-10-02 22:37:51 +00:00
parent d3c87657ba
commit 641b1de2af
2 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/distutils/tests/test_config.py
View file

@ -49,13 +49,14 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
def setUp(self): def setUp(self):
"""Patches the environment.""" """Patches the environment."""
super(PyPIRCCommandTestCase, self).setUp()
if os.environ.has_key('HOME'): if os.environ.has_key('HOME'):
self._old_home = os.environ['HOME'] self._old_home = os.environ['HOME']
else: else:
self._old_home = None self._old_home = None
curdir = os.path.dirname(__file__) tempdir = self.mkdtemp()
os.environ['HOME'] = curdir os.environ['HOME'] = tempdir
self.rc = os.path.join(curdir, '.pypirc') self.rc = os.path.join(tempdir, '.pypirc')
self.dist = Distribution() self.dist = Distribution()
class command(PyPIRCCommand): class command(PyPIRCCommand):
@ -74,9 +75,8 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase):
del os.environ['HOME'] del os.environ['HOME']
else: else:
os.environ['HOME'] = self._old_home os.environ['HOME'] = self._old_home
if os.path.exists(self.rc):
os.remove(self.rc)
set_threshold(self.old_threshold) set_threshold(self.old_threshold)
super(PyPIRCCommandTestCase, self).tearDown()
def test_server_registration(self): def test_server_registration(self):
# This test makes sure PyPIRCCommand knows how to: # This test makes sure PyPIRCCommand knows how to:

42
Lib/distutils/tests/test_sdist.py
View file

@ -12,9 +12,6 @@ from distutils.tests.test_config import PyPIRCCommandTestCase
from distutils.errors import DistutilsExecError from distutils.errors import DistutilsExecError
from distutils.spawn import find_executable from distutils.spawn import find_executable
CURDIR = os.path.dirname(__file__)
TEMP_PKG = join(CURDIR, 'temppkg')
SETUP_PY = """ SETUP_PY = """
from distutils.core import setup from distutils.core import setup
import somecode import somecode
@ -31,25 +28,24 @@ class sdistTestCase(PyPIRCCommandTestCase):
def setUp(self): def setUp(self):
super(sdistTestCase, self).setUp() super(sdistTestCase, self).setUp()
self.old_path = os.getcwd() self.old_path = os.getcwd()
self.temp_pkg = os.path.join(self.mkdtemp(), 'temppkg')
def tearDown(self): def tearDown(self):
os.chdir(self.old_path) os.chdir(self.old_path)
if os.path.exists(TEMP_PKG):
shutil.rmtree(TEMP_PKG)
super(sdistTestCase, self).tearDown() super(sdistTestCase, self).tearDown()
def _init_tmp_pkg(self): def _init_tmp_pkg(self):
if os.path.exists(TEMP_PKG): if os.path.exists(self.temp_pkg):
shutil.rmtree(TEMP_PKG) shutil.rmtree(self.temp_pkg)
os.mkdir(TEMP_PKG) os.mkdir(self.temp_pkg)
os.mkdir(join(TEMP_PKG, 'somecode')) os.mkdir(join(self.temp_pkg, 'somecode'))
os.mkdir(join(TEMP_PKG, 'dist')) os.mkdir(join(self.temp_pkg, 'dist'))
# creating a MANIFEST, a package, and a README # creating a MANIFEST, a package, and a README
self._write(join(TEMP_PKG, 'MANIFEST.in'), MANIFEST_IN) self._write(join(self.temp_pkg, 'MANIFEST.in'), MANIFEST_IN)
self._write(join(TEMP_PKG, 'README'), 'xxx') self._write(join(self.temp_pkg, 'README'), 'xxx')
self._write(join(TEMP_PKG, 'somecode', '__init__.py'), '#') self._write(join(self.temp_pkg, 'somecode', '__init__.py'), '#')
self._write(join(TEMP_PKG, 'setup.py'), SETUP_PY) self._write(join(self.temp_pkg, 'setup.py'), SETUP_PY)
os.chdir(TEMP_PKG) os.chdir(self.temp_pkg)
def _write(self, path, content): def _write(self, path, content):
f = open(path, 'w') f = open(path, 'w')
@ -65,15 +61,15 @@ class sdistTestCase(PyPIRCCommandTestCase):
self._init_tmp_pkg() self._init_tmp_pkg()
# creating VCS directories with some files in them # creating VCS directories with some files in them
os.mkdir(join(TEMP_PKG, 'somecode', '.svn')) os.mkdir(join(self.temp_pkg, 'somecode', '.svn'))
self._write(join(TEMP_PKG, 'somecode', '.svn', 'ok.py'), 'xxx') self._write(join(self.temp_pkg, 'somecode', '.svn', 'ok.py'), 'xxx')
os.mkdir(join(TEMP_PKG, 'somecode', '.hg')) os.mkdir(join(self.temp_pkg, 'somecode', '.hg'))
self._write(join(TEMP_PKG, 'somecode', '.hg', self._write(join(self.temp_pkg, 'somecode', '.hg',
'ok'), 'xxx') 'ok'), 'xxx')
os.mkdir(join(TEMP_PKG, 'somecode', '.git')) os.mkdir(join(self.temp_pkg, 'somecode', '.git'))
self._write(join(TEMP_PKG, 'somecode', '.git', self._write(join(self.temp_pkg, 'somecode', '.git',
'ok'), 'xxx') 'ok'), 'xxx')
# now building a sdist # now building a sdist
@ -96,7 +92,7 @@ class sdistTestCase(PyPIRCCommandTestCase):
cmd.run() cmd.run()
# now let's check what we have # 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) files = os.listdir(dist_folder)
self.assertEquals(files, ['fake-1.0.zip']) self.assertEquals(files, ['fake-1.0.zip'])
@ -137,7 +133,7 @@ class sdistTestCase(PyPIRCCommandTestCase):
cmd.run() cmd.run()
# making sure we have two files # 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 = os.listdir(dist_folder)
result.sort() result.sort()
self.assertEquals(result, self.assertEquals(result,