skip tests with a non-ascii cwd when the file system encoding is ascii

1 files changed, 5 insertions, 8 deletions

diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
index c93177fe36..f477ddb42b 100644
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -1,6 +1,7 @@
 import macpath
 from test import test_support
 import unittest
+import test_genericpath
 
 
 class MacPathTestCase(unittest.TestCase):
@@ -8,15 +9,11 @@ class MacPathTestCase(unittest.TestCase):
     def test_abspath(self):
         self.assertEqual(macpath.abspath("xx:yy"), "xx:yy")
 
-        # Issue 3426: check that abspath retuns unicode when the arg is unicode
-        # and str when it's str, with both ASCII and non-ASCII cwds
-        for cwd in (u'cwd', u'\xe7w\xf0'):
-            with test_support.temp_cwd(cwd):
-                for path in ('', 'foo', 'f\xf2\xf2', '/foo', 'C:\\'):
-                    self.assertIsInstance(macpath.abspath(path), str)
-                for upath in (u'', u'fuu', u'f\xf9\xf9', u'/fuu', u'U:\\'):
-                    self.assertIsInstance(macpath.abspath(upath), unicode)
+    def test_abspath_with_ascii_cwd(self):
+        test_genericpath._issue3426(self, u'cwd', macpath.abspath)
 
+    def test_abspath_with_nonascii_cwd(self):
+        test_genericpath._issue3426(self, u'\xe7w\xf0', macpath.abspath)
 
     def test_isabs(self):
         isabs = macpath.isabs