Changeset 391 for python/trunk/Lib/test/test_macpath.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_macpath.py (modified) (2 diffs)

python/trunk/Lib/test/test_macpath.py

@@ -1 @@
-import os
-import sys
 import macpath
-from test import test_support
+from test import test_support, test_genericpath
 import unittest
 
@@ -9 +7 @@
 
     def test_abspath(self):
-        self.assert_(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
-        saved_cwd = os.getcwd()
-        cwds = ['cwd']
-        try:
-            cwds.append(u'\xe7w\xf0'.encode(sys.getfilesystemencoding()
-                                            or 'ascii'))
-        except UnicodeEncodeError:
-            pass # the cwd can't be encoded -- test with ascii cwd only
-        for cwd in cwds:
-            try:
-                os.mkdir(cwd)
-                os.chdir(cwd)
-                for path in ('', 'foo', 'f\xf2\xf2', '/foo', 'C:\\'):
-                    self.assertTrue(isinstance(macpath.abspath(path), str))
-                for upath in (u'', u'fuu', u'f\xf9\xf9', u'/fuu', u'U:\\'):
-                    self.assertTrue(isinstance(macpath.abspath(upath), unicode))
-            finally:
-                os.chdir(saved_cwd)
-                os.rmdir(cwd)
-
+        self.assertEqual(macpath.abspath("xx:yy"), "xx:yy")
 
     def test_isabs(self):
         isabs = macpath.isabs
-        self.assert_(isabs("xx:yy"))
-        self.assert_(isabs("xx:yy:"))
-        self.assert_(isabs("xx:"))
-        self.failIf(isabs("foo"))
-        self.failIf(isabs(":foo"))
-        self.failIf(isabs(":foo:bar"))
-        self.failIf(isabs(":foo:bar:"))
-
-
-    def test_commonprefix(self):
-        commonprefix = macpath.commonprefix
-        self.assert_(commonprefix(["home:swenson:spam", "home:swen:spam"])
-                     == "home:swen")
-        self.assert_(commonprefix([":home:swen:spam", ":home:swen:eggs"])
-                     == ":home:swen:")
-        self.assert_(commonprefix([":home:swen:spam", ":home:swen:spam"])
-                     == ":home:swen:spam")
+        self.assertTrue(isabs("xx:yy"))
+        self.assertTrue(isabs("xx:yy:"))
+        self.assertTrue(isabs("xx:"))
+        self.assertFalse(isabs("foo"))
+        self.assertFalse(isabs(":foo"))
+        self.assertFalse(isabs(":foo:bar"))
+        self.assertFalse(isabs(":foo:bar:"))
 
     def test_split(self):
         split = macpath.split
-        self.assertEquals(split("foo:bar"),
+        self.assertEqual(split("foo:bar"),
                           ('foo:', 'bar'))
-        self.assertEquals(split("conky:mountpoint:foo:bar"),
+        self.assertEqual(split("conky:mountpoint:foo:bar"),
                           ('conky:mountpoint:foo', 'bar'))
 
-        self.assertEquals(split(":"), ('', ''))
-        self.assertEquals(split(":conky:mountpoint:"),
+        self.assertEqual(split(":"), ('', ''))
+        self.assertEqual(split(":conky:mountpoint:"),
                           (':conky:mountpoint', ''))
-
-    def test_splitdrive(self):
-        splitdrive = macpath.splitdrive
-        self.assertEquals(splitdrive("foo:bar"), ('', 'foo:bar'))
-        self.assertEquals(splitdrive(":foo:bar"), ('', ':foo:bar'))
 
     def test_splitext(self):
         splitext = macpath.splitext
-        self.assertEquals(splitext(":foo.ext"), (':foo', '.ext'))
-        self.assertEquals(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
-        self.assertEquals(splitext(".ext"), ('.ext', ''))
-        self.assertEquals(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
-        self.assertEquals(splitext(":foo.ext:"), (':foo.ext:', ''))
-        self.assertEquals(splitext(""), ('', ''))
-        self.assertEquals(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
+        self.assertEqual(splitext(":foo.ext"), (':foo', '.ext'))
+        self.assertEqual(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
+        self.assertEqual(splitext(".ext"), ('.ext', ''))
+        self.assertEqual(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
+        self.assertEqual(splitext(":foo.ext:"), (':foo.ext:', ''))
+        self.assertEqual(splitext(""), ('', ''))
+        self.assertEqual(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
+
+    def test_normpath(self):
+        # Issue 5827: Make sure normpath preserves unicode
+        for path in (u'', u'.', u'/', u'\\', u':', u'///foo/.//bar//'):
+            self.assertIsInstance(macpath.normpath(path), unicode,
+                                  'normpath() returned str instead of unicode')
+
+class MacCommonTest(test_genericpath.CommonTest):
+    pathmodule = macpath
 
 
 def test_main():
-    test_support.run_unittest(MacPathTestCase)
+    test_support.run_unittest(MacPathTestCase, MacCommonTest)