diff options
Diffstat (limited to 'Lib/test/test_posixpath.py')
| -rw-r--r-- | Lib/test/test_posixpath.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index 262e09dfdb..0e7d866485 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -1,11 +1,11 @@ -import unittest -from test import support, test_genericpath - import itertools -import posixpath import os +import posixpath import sys +import unittest +import warnings from posixpath import realpath, abspath, dirname, basename +from test import support, test_genericpath try: import posix @@ -245,7 +245,9 @@ class PosixPathTest(unittest.TestCase): def test_ismount(self): self.assertIs(posixpath.ismount("/"), True) - self.assertIs(posixpath.ismount(b"/"), True) + with warnings.catch_warnings(): + warnings.simplefilter("ignore", DeprecationWarning) + self.assertIs(posixpath.ismount(b"/"), True) def test_ismount_non_existent(self): # Non-existent mountpoint. @@ -316,7 +318,8 @@ class PosixPathTest(unittest.TestCase): # expanduser should fall back to using the password database del env['HOME'] home = pwd.getpwuid(os.getuid()).pw_dir - self.assertEqual(posixpath.expanduser("~"), home) + # $HOME can end with a trailing /, so strip it (see #17809) + self.assertEqual(posixpath.expanduser("~"), home.rstrip("/")) def test_normpath(self): self.assertEqual(posixpath.normpath(""), ".") @@ -598,14 +601,10 @@ class PosixPathTest(unittest.TestCase): self.assertTrue(posixpath.sameopenfile(a.fileno(), b.fileno())) -class PosixCommonTest(test_genericpath.CommonTest): +class PosixCommonTest(test_genericpath.CommonTest, unittest.TestCase): pathmodule = posixpath attributes = ['relpath', 'samefile', 'sameopenfile', 'samestat'] -def test_main(): - support.run_unittest(PosixPathTest, PosixCommonTest) - - if __name__=="__main__": - test_main() + unittest.main() |