From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Mon, 8 Mar 2010 12:39:35 +0000 (+0000)
Subject: Move some tests from test_macpath to test_genericpath.CommonTest
X-Git-Tag: v2.7b1~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f682be82b4ce2c64590fdc1255bd0b82d33b0f0;p=python

Move some tests from test_macpath to test_genericpath.CommonTest
---

diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index fc0c33d430..af501cf0c7 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -47,6 +47,18 @@ class GenericTest(unittest.TestCase):
             commonprefix(["/home/swen/spam", "/home/swen/spam"]),
             "/home/swen/spam"
         )
+        self.assertEqual(
+            commonprefix(["home:swenson:spam", "home:swen:spam"]),
+            "home:swen"
+        )
+        self.assertEqual(
+            commonprefix([":home:swen:spam", ":home:swen:eggs"]),
+            ":home:swen:"
+        )
+        self.assertEqual(
+            commonprefix([":home:swen:spam", ":home:swen:spam"]),
+            ":home:swen:spam"
+        )
 
         testlist = ['', 'abc', 'Xbcd', 'Xb', 'XY', 'abcd',
                     'aXc', 'abd', 'ab', 'aX', 'abcX']
diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
index b29ed4c02c..2c86c532c7 100644
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -18,16 +18,6 @@ class MacPathTestCase(unittest.TestCase):
         self.assertFalse(isabs(":foo:bar"))
         self.assertFalse(isabs(":foo:bar:"))
 
-
-    def test_commonprefix(self):
-        commonprefix = macpath.commonprefix
-        self.assertEqual(commonprefix(["home:swenson:spam", "home:swen:spam"]),
-                         "home:swen")
-        self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:eggs"]),
-                         ":home:swen:")
-        self.assertEqual(commonprefix([":home:swen:spam", ":home:swen:spam"]),
-                         ":home:swen:spam")
-
     def test_split(self):
         split = macpath.split
         self.assertEqual(split("foo:bar"),