traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert changeset r81150 which helped diagnose issue #8423 on some OS X buildbot.

This commit is contained in:
Florent Xicluna 2010-05-13 23:46:48 +00:00
parent 9cf210f392
commit b3d0554040
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/test/test_pep277.py
View File

@ -130,14 +130,10 @@ class UnicodeFileTests(unittest.TestCase):
if sys.platform == 'darwin': if sys.platform == 'darwin':
files = set(normalize('NFD', file) for file in files) files = set(normalize('NFD', file) for file in files)
for name in others: for name in others:
if sys.platform == 'darwin': if sys.platform == 'darwin' and normalize('NFD', name) in files:
# Mac OS X decomposes Unicode names. See comment above. # Mac OS X decomposes Unicode names. See comment above.
try: os.stat(name)
os.stat(name) continue
if normalize('NFD', name) in files:
continue
except OSError:
pass
self._apply_failure(open, name, IOError) self._apply_failure(open, name, IOError)
self._apply_failure(os.stat, name, OSError) self._apply_failure(os.stat, name, OSError)
self._apply_failure(os.chdir, name, OSError) self._apply_failure(os.chdir, name, OSError)
@ -156,16 +152,7 @@ class UnicodeFileTests(unittest.TestCase):
sf0 = set(normalize('NFD', unicode(f)) for f in self.files) sf0 = set(normalize('NFD', unicode(f)) for f in self.files)
f2 = [normalize('NFD', unicode(f)) for f in f2] f2 = [normalize('NFD', unicode(f)) for f in f2]
sf2 = set(os.path.join(unicode(test_support.TESTFN), f) for f in f2) sf2 = set(os.path.join(unicode(test_support.TESTFN), f) for f in f2)
try: self.assertEqual(sf0, sf2)
self.assertEqual(sf0, sf2)
except self.failureException:
if sys.platform != 'darwin':
raise
# XXX Troubleshoot issue #8423
f2 = os.listdir(unicode(test_support.TESTFN,
sys.getfilesystemencoding()))
sf2 = set(os.path.join(unicode(test_support.TESTFN), f) for f in f2)
self.assertEqual(set(self.files), sf2)
self.assertEqual(len(f1), len(f2)) self.assertEqual(len(f1), len(f2))
def test_rename(self): def test_rename(self):