From: Jason R. Coombs <jaraco@jaraco.com>
Date: Wed, 28 Dec 2011 16:42:22 +0000 (-0500)
Subject: Limit test scope to those platforms that can save the target filenames. Reference... 
X-Git-Tag: v2.7.3rc1~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79e50c659ab769acad641117671a34ebcd7c53d9;p=python

Limit test scope to those platforms that can save the target filenames. Reference #11638.
---

diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index 2881148cc2..f01cec3263 100644
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -4,6 +4,7 @@ __revision__ = "$Id$"
 
 import unittest
 import os
+import sys
 import tarfile
 from os.path import splitdrive
 import warnings
@@ -34,6 +35,18 @@ try:
 except ImportError:
     zlib = None
 
+def can_fs_encode(filename):
+    """
+    Return True if the filename can be saved in the file system.
+    """
+    if os.path.supports_unicode_filenames:
+        return True
+    try:
+        filename.encode(sys.getfilesystemencoding())
+    except UnicodeEncodeError:
+        return False
+    return True
+
 
 class ArchiveUtilTestCase(support.TempdirManager,
                           support.LoggingSilencer,
@@ -289,6 +302,8 @@ class ArchiveUtilTestCase(support.TempdirManager,
         self._make_tarball(u'archive')
 
     @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(can_fs_encode(u'Ã¥rchiv'),
+        'File system cannot handle this filename')
     def test_make_tarball_unicode_latin1(self):
         """
         Mirror test_make_tarball, except filename is unicode and contains
@@ -297,6 +312,8 @@ class ArchiveUtilTestCase(support.TempdirManager,
         self._make_tarball(u'Ã¥rchiv') # note this isn't a real word
 
     @unittest.skipUnless(zlib, "requires zlib")
+    @unittest.skipUnless(can_fs_encode(u'のアーカイブ'),
+        'File system cannot handle this filename')
     def test_make_tarball_unicode_extended(self):
         """
         Mirror test_make_tarball, except filename is unicode and contains