diff options
| author | Steve Dower <steve.dower@python.org> | 2019-09-10 14:52:48 +0100 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2019-09-10 14:52:48 +0100 |
| commit | 97d7906e30eeee1261b20a45a22242a8accb1cfb (patch) | |
| tree | 2d94ba32b612a2fbe82b2abd7b42a89d8ef04c28 /Lib/test/test_pathlib.py | |
| parent | cd8221152dd235ec5d06e3d9d0d8787645bbac8e (diff) | |
| download | cpython-97d7906e30eeee1261b20a45a22242a8accb1cfb.tar.gz cpython-97d7906e30eeee1261b20a45a22242a8accb1cfb.zip | |
bpo-38087: Fix case sensitivity in test_pathlib and test_ntpath (GH-15850)
Diffstat (limited to 'Lib/test/test_pathlib.py')
| -rw-r--r-- | Lib/test/test_pathlib.py | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py index cfda0a21882..34c66f3137f 100644 --- a/Lib/test/test_pathlib.py +++ b/Lib/test/test_pathlib.py @@ -1361,10 +1361,13 @@ class _BasePathTest(object): func(*args, **kwargs) self.assertEqual(cm.exception.errno, errno.ENOENT) + def assertEqualNormCase(self, path_a, path_b): + self.assertEqual(os.path.normcase(path_a), os.path.normcase(path_b)) + def _test_cwd(self, p): q = self.cls(os.getcwd()) self.assertEqual(p, q) - self.assertEqual(str(p), str(q)) + self.assertEqualNormCase(str(p), str(q)) self.assertIs(type(p), type(q)) self.assertTrue(p.is_absolute()) @@ -1375,7 +1378,7 @@ class _BasePathTest(object): def _test_home(self, p): q = self.cls(os.path.expanduser('~')) self.assertEqual(p, q) - self.assertEqual(str(p), str(q)) + self.assertEqualNormCase(str(p), str(q)) self.assertIs(type(p), type(q)) self.assertTrue(p.is_absolute()) @@ -1583,14 +1586,14 @@ class _BasePathTest(object): p.resolve(strict=True) self.assertEqual(cm.exception.errno, errno.ENOENT) # Non-strict - self.assertEqual(str(p.resolve(strict=False)), - os.path.join(BASE, 'foo')) + self.assertEqualNormCase(str(p.resolve(strict=False)), + os.path.join(BASE, 'foo')) p = P(BASE, 'foo', 'in', 'spam') - self.assertEqual(str(p.resolve(strict=False)), - os.path.join(BASE, 'foo', 'in', 'spam')) + self.assertEqualNormCase(str(p.resolve(strict=False)), + os.path.join(BASE, 'foo', 'in', 'spam')) p = P(BASE, '..', 'foo', 'in', 'spam') - self.assertEqual(str(p.resolve(strict=False)), - os.path.abspath(os.path.join('foo', 'in', 'spam'))) + self.assertEqualNormCase(str(p.resolve(strict=False)), + os.path.abspath(os.path.join('foo', 'in', 'spam'))) # These are all relative symlinks. p = P(BASE, 'dirB', 'fileB') self._check_resolve_relative(p, p) @@ -2137,16 +2140,16 @@ class _BasePathTest(object): # Resolve absolute paths. p = (P / 'link0').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = (P / 'link1').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = (P / 'link2').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = (P / 'link3').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) # Resolve relative paths. old_path = os.getcwd() @@ -2154,16 +2157,16 @@ class _BasePathTest(object): try: p = self.cls('link0').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = self.cls('link1').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = self.cls('link2').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) p = self.cls('link3').resolve() self.assertEqual(p, P) - self.assertEqual(str(p), BASE) + self.assertEqualNormCase(str(p), BASE) finally: os.chdir(old_path) |