From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 31 Oct 2012 22:01:30 +0000 (+0100)
Subject: Issue #15441, #15478: Reenable test_nonascii_abspath() on Windows
X-Git-Tag: v3.4.0a1~2122^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fce2a6e0c026641cd73d12acde521d12f41ad3ff;p=thirdparty%2FPython%2Fcpython.git

Issue #15441, #15478: Reenable test_nonascii_abspath() on Windows

The real bug (issue #15478) has been fixed correctly.
---

diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index 3eadd5893c4c..600ffc03d920 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -311,14 +311,10 @@ class CommonTest(GenericTest):
     @unittest.skipIf(sys.platform == 'darwin',
         "Mac OS X denies the creation of a directory with an invalid utf8 name")
     def test_nonascii_abspath(self):
-        name = b'\xe7w\xf0'
-        if sys.platform == 'win32':
-            try:
-                os.fsdecode(name)
-            except UnicodeDecodeError:
-                self.skipTest("the filename %a is not decodable "
-                              "from the ANSI code page %s"
-                              % (name, sys.getfilesystemencoding()))
+        if support.TESTFN_UNDECODABLE:
+            name = support.TESTFN_UNDECODABLE
+        else:
+            name = b'a\xffb\xe7w\xf0'
 
         # Test non-ASCII, non-UTF8 bytes in the path.
         with warnings.catch_warnings():