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
........

diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index 1c88457d01241a0d96b2b246af745f84d2860792..cabb55bc15ff88fa11fe019f05f763372e5ff5db 100644 (file)
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -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'

diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index 9bd6530c14c2b56321fd560df6ada34831eeeef0..6b22f05ff0064baab7886167f03840abc8bd4a88 100644 (file)
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -88,7 +88,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
             self.assertEquals(ensure_relative('/home/foo'), 'home/foo')
             self.assertEquals(ensure_relative('some/path'), 'some/path')
         else:   # \\
-            self.assertEquals(ensure_relative('c:\\home\\foo'), 'home\\foo')
+            self.assertEquals(ensure_relative('c:\\home\\foo'), 'c:home\\foo')
             self.assertEquals(ensure_relative('home\\foo'), 'home\\foo')
 
 def test_suite():

diff --git a/Misc/NEWS b/Misc/NEWS
index 87e471e7b6970d410084783432c1b3a3421147fd..bb028d9f39f53eafa49948770dc57346de56e27a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -618,6 +618,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #6053: Fixed distutils tests on win32. patch by Hirokazu Yamamoto.
+
 - Issue #6046: Fixed the library extension when distutils build_ext is used
   inplace. Initial patch by Roumen Petrov.