Kaydet (Commit) 2db61fb7 authored tarafından Florent Xicluna's avatar Florent Xicluna

Tentatively enable test_pep277 on all platforms.

üst d8472a45
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
# open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir # open, os.open, os.stat. os.listdir, os.rename, os.remove, os.mkdir, os.chdir, os.rmdir
import sys, os, unittest import sys, os, unittest
from test import test_support from test import test_support
if not os.path.supports_unicode_filenames: ## There's no obvious reason to skip these tests on POSIX systems
raise unittest.SkipTest, "test works only on NT+" # if not os.path.supports_unicode_filenames:
# raise unittest.SkipTest, "test works only on NT+"
filenames = [ filenames = [
'abc', 'abc',
...@@ -51,6 +52,9 @@ class UnicodeFileTests(unittest.TestCase): ...@@ -51,6 +52,9 @@ class UnicodeFileTests(unittest.TestCase):
raise test_support.TestFailed("Expected to fail calling '%s(%r)'" raise test_support.TestFailed("Expected to fail calling '%s(%r)'"
% (fn.__name__, filename)) % (fn.__name__, filename))
except expected_exception, details: except expected_exception, details:
# the "filename" exception attribute may be encoded
if isinstance(details.filename, str):
filename = filename.encode(sys.getfilesystemencoding())
if check_fn_in_exception and details.filename != filename: if check_fn_in_exception and details.filename != filename:
raise test_support.TestFailed("Function '%s(%r) failed with " raise test_support.TestFailed("Function '%s(%r) failed with "
"bad filename in the exception: %r" "bad filename in the exception: %r"
...@@ -80,7 +84,7 @@ class UnicodeFileTests(unittest.TestCase): ...@@ -80,7 +84,7 @@ class UnicodeFileTests(unittest.TestCase):
f1 = os.listdir(test_support.TESTFN) f1 = os.listdir(test_support.TESTFN)
f2 = os.listdir(unicode(test_support.TESTFN, f2 = os.listdir(unicode(test_support.TESTFN,
sys.getfilesystemencoding())) sys.getfilesystemencoding()))
sf2 = set(u"\\".join((unicode(test_support.TESTFN), f)) sf2 = set(os.path.join(unicode(test_support.TESTFN), f)
for f in f2) for f in f2)
self.assertEqual(len(f1), len(self.files)) self.assertEqual(len(f1), len(self.files))
self.assertEqual(sf2, set(self.files)) self.assertEqual(sf2, set(self.files))
......
...@@ -106,6 +106,8 @@ Extension Modules ...@@ -106,6 +106,8 @@ Extension Modules
Tests Tests
----- -----
- Issue #767675: enable test_pep277 on all platforms.
- Issue #6292: for the moment at least, the test suite runs cleanly if python - Issue #6292: for the moment at least, the test suite runs cleanly if python
is run with the -OO flag. Tests requiring docstrings are skipped. is run with the -OO flag. Tests requiring docstrings are skipped.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment