Merged revisions 72768 via svnmerge from

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

........
  r72768 | tarek.ziade | 2009-05-18 14:21:26 +0200 (Mon, 18 May 2009) | 1 line

  Fixed #6053 - win32 fixes for distutils tests
........
This commit is contained in:
Tarek Ziadé 2009-05-18 12:29:06 +00:00
parent 40c00271fe
commit 93fb3aad50
3 changed files with 9 additions and 3 deletions

View file

@ -3,6 +3,7 @@ __revision__ = "$Id$"
import unittest
import os
from os.path import splitdrive
from distutils.archive_util import (check_archive_formats, make_tarball,
make_zipfile, make_archive)
@ -26,13 +27,16 @@ class ArchiveUtilTestCase(support.TempdirManager,
self.write_file([tmpdir, 'file2'], 'xxx')
tmpdir2 = self.mkdtemp()
unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0],
"Source and target should be on same drive")
base_name = os.path.join(tmpdir2, 'archive')
# working with relative paths to avoid tar warnings
old_dir = os.getcwd()
os.chdir(tmpdir)
try:
make_tarball(base_name, '.')
make_tarball(splitdrive(base_name)[1], '.')
finally:
os.chdir(old_dir)
@ -45,7 +49,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
old_dir = os.getcwd()
os.chdir(tmpdir)
try:
make_tarball(base_name, '.', compress=None)
make_tarball(splitdrive(base_name)[1], '.', compress=None)
finally:
os.chdir(old_dir)
tarball = base_name + '.tar'