1 files changed, 76 insertions, 6 deletions
diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
index 2c86c532c7e..d732e14a3a4 100644
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -1,5 +1,5 @@
 import macpath
-from test import test_support, test_genericpath
+from test import support, test_genericpath
 import unittest
 
 
@@ -18,6 +18,14 @@ class MacPathTestCase(unittest.TestCase):
         self.assertFalse(isabs(":foo:bar"))
         self.assertFalse(isabs(":foo:bar:"))
 
+        self.assertTrue(isabs(b"xx:yy"))
+        self.assertTrue(isabs(b"xx:yy:"))
+        self.assertTrue(isabs(b"xx:"))
+        self.assertFalse(isabs(b"foo"))
+        self.assertFalse(isabs(b":foo"))
+        self.assertFalse(isabs(b":foo:bar"))
+        self.assertFalse(isabs(b":foo:bar:"))
+
     def test_split(self):
         split = macpath.split
         self.assertEqual(split("foo:bar"),
@@ -29,6 +37,29 @@ class MacPathTestCase(unittest.TestCase):
         self.assertEqual(split(":conky:mountpoint:"),
                           (':conky:mountpoint', ''))
 
+        self.assertEqual(split(b"foo:bar"),
+                          (b'foo:', b'bar'))
+        self.assertEqual(split(b"conky:mountpoint:foo:bar"),
+                          (b'conky:mountpoint:foo', b'bar'))
+
+        self.assertEqual(split(b":"), (b'', b''))
+        self.assertEqual(split(b":conky:mountpoint:"),
+                          (b':conky:mountpoint', b''))
+
+    def test_join(self):
+        join = macpath.join
+        self.assertEqual(join('a', 'b'), ':a:b')
+        self.assertEqual(join('', 'a:b'), 'a:b')
+        self.assertEqual(join('a:b', 'c'), 'a:b:c')
+        self.assertEqual(join('a:b', ':c'), 'a:b:c')
+        self.assertEqual(join('a', ':b', ':c'), ':a:b:c')
+
+        self.assertEqual(join(b'a', b'b'), b':a:b')
+        self.assertEqual(join(b'', b'a:b'), b'a:b')
+        self.assertEqual(join(b'a:b', b'c'), b'a:b:c')
+        self.assertEqual(join(b'a:b', b':c'), b'a:b:c')
+        self.assertEqual(join(b'a', b':b', b':c'), b':a:b:c')
+
     def test_splitext(self):
         splitext = macpath.splitext
         self.assertEqual(splitext(":foo.ext"), (':foo', '.ext'))
@@ -39,18 +70,57 @@ class MacPathTestCase(unittest.TestCase):
         self.assertEqual(splitext(""), ('', ''))
         self.assertEqual(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
 
+        self.assertEqual(splitext(b":foo.ext"), (b':foo', b'.ext'))
+        self.assertEqual(splitext(b"foo:foo.ext"), (b'foo:foo', b'.ext'))
+        self.assertEqual(splitext(b".ext"), (b'.ext', b''))
+        self.assertEqual(splitext(b"foo.ext:foo"), (b'foo.ext:foo', b''))
+        self.assertEqual(splitext(b":foo.ext:"), (b':foo.ext:', b''))
+        self.assertEqual(splitext(b""), (b'', b''))
+        self.assertEqual(splitext(b"foo.bar.ext"), (b'foo.bar', b'.ext'))
+
+    def test_ismount(self):
+        ismount = macpath.ismount
+        self.assertEqual(ismount("a:"), True)
+        self.assertEqual(ismount("a:b"), False)
+        self.assertEqual(ismount("a:b:"), True)
+        self.assertEqual(ismount(""), False)
+        self.assertEqual(ismount(":"), False)
+
+        self.assertEqual(ismount(b"a:"), True)
+        self.assertEqual(ismount(b"a:b"), False)
+        self.assertEqual(ismount(b"a:b:"), True)
+        self.assertEqual(ismount(b""), False)
+        self.assertEqual(ismount(b":"), False)
+
     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')
+        normpath = macpath.normpath
+        self.assertEqual(normpath("a:b"), "a:b")
+        self.assertEqual(normpath("a"), ":a")
+        self.assertEqual(normpath("a:b::c"), "a:c")
+        self.assertEqual(normpath("a:b:c:::d"), "a:d")
+        self.assertRaises(macpath.norm_error, normpath, "a::b")
+        self.assertRaises(macpath.norm_error, normpath, "a:b:::c")
+        self.assertEqual(normpath(":"), ":")
+        self.assertEqual(normpath("a:"), "a:")
+        self.assertEqual(normpath("a:b:"), "a:b")
+
+        self.assertEqual(normpath(b"a:b"), b"a:b")
+        self.assertEqual(normpath(b"a"), b":a")
+        self.assertEqual(normpath(b"a:b::c"), b"a:c")
+        self.assertEqual(normpath(b"a:b:c:::d"), b"a:d")
+        self.assertRaises(macpath.norm_error, normpath, b"a::b")
+        self.assertRaises(macpath.norm_error, normpath, b"a:b:::c")
+        self.assertEqual(normpath(b":"), b":")
+        self.assertEqual(normpath(b"a:"), b"a:")
+        self.assertEqual(normpath(b"a:b:"), b"a:b")
+
 
 class MacCommonTest(test_genericpath.CommonTest):
     pathmodule = macpath
 
 
 def test_main():
-    test_support.run_unittest(MacPathTestCase, MacCommonTest)
+    support.run_unittest(MacPathTestCase, MacCommonTest)
 
 
 if __name__ == "__main__":