diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2013-04-11 18:04:06 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2013-04-11 18:04:06 -0700 |
| commit | a65b6ea00662c72fff9a887b1313c439e32a9219 (patch) | |
| tree | 16f5a8f8ff60fc8dcd254134c5893f8fac1426a4 | |
| parent | 49ce80613b7fcffd1882f7fb082e5bcc30e976f0 (diff) | |
| download | external_python_setuptools-a65b6ea00662c72fff9a887b1313c439e32a9219.tar.gz external_python_setuptools-a65b6ea00662c72fff9a887b1313c439e32a9219.tar.bz2 external_python_setuptools-a65b6ea00662c72fff9a887b1313c439e32a9219.zip | |
Skip test when file system encoding is not suitable. Fixes #55 and Distribute #363.1.1.7
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_sdist.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index f97dca3c..b97c1004 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,8 @@ CHANGES launcher for 'develop' installs). * ``ez_setup.py`` now ensures partial downloads are cleaned up following a failed download. +* Distribute #363 and Issue #55: Skip an sdist test that fails on locales + other than UTF-8. ----- 1.1.6 diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py index 438f7ced..19f6d4cd 100644 --- a/setuptools/tests/test_sdist.py +++ b/setuptools/tests/test_sdist.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """sdist tests""" - +import locale import os import shutil import sys @@ -10,6 +10,7 @@ import unittest import unicodedata from setuptools.compat import StringIO, unicode +from setuptools.tests.py26compat import skipIf from setuptools.command.sdist import sdist from setuptools.command.egg_info import manifest_maker from setuptools.dist import Distribution @@ -318,6 +319,8 @@ class TestSdistTest(unittest.TestCase): filename = filename.decode('latin-1') self.assertFalse(filename in cmd.filelist.files) + @skipIf(sys.version_info >= (3,) and locale.getpreferredencoding() != 'UTF-8', + 'Unittest fails if locale is not utf-8 but the manifests is recorded correctly') def test_sdist_with_utf8_encoded_filename(self): # Test for #303. dist = Distribution(SETUP_ATTRS) |