diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 09:47:55 +0000 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-02-20 09:47:55 +0000 |
| commit | c4ba12216c14bcfa2fc97e6498232d13f512bd60 (patch) | |
| tree | 0c05260353222ab5f2cb3059f689edaa17a60644 /Lib/test/test_posixpath.py | |
| parent | 413c5c769e0c276424e644f63ab7d0c2fab991e5 (diff) | |
| download | cpython-c4ba12216c14bcfa2fc97e6498232d13f512bd60.tar.gz | |
Merged revisions 78249 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78249 | ezio.melotti | 2010-02-20 11:40:07 +0200 (Sat, 20 Feb 2010) | 1 line
Remove e assertIs definitions and use correct assert* methods.
........
Diffstat (limited to 'Lib/test/test_posixpath.py')
| -rw-r--r-- | Lib/test/test_posixpath.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index f2277c93d0..1b1167a006 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -25,9 +25,6 @@ class PosixPathTest(unittest.TestCase): support.unlink(support.TESTFN + suffix) safe_rmdir(support.TESTFN + suffix) - def assertIs(self, a, b): - self.assertTrue(a is b) - def test_normcase(self): # Check that normcase() is idempotent p = "FoO/./BaR" @@ -229,8 +226,8 @@ class PosixPathTest(unittest.TestCase): f.close() self.assertEqual(d, b"foobar") - self.assertTrue( - posixpath.getctime(support.TESTFN) <= + self.assertLessEqual( + posixpath.getctime(support.TESTFN), posixpath.getmtime(support.TESTFN) ) finally: @@ -560,7 +557,8 @@ class PosixPathTest(unittest.TestCase): self.assertEqual(realpath(ABSTFN + "/link-y/.."), ABSTFN + "/k") # Relative path. os.chdir(dirname(ABSTFN)) - self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."), ABSTFN + "/k") + self.assertEqual(realpath(basename(ABSTFN) + "/link-y/.."), + ABSTFN + "/k") finally: os.chdir(old_path) support.unlink(ABSTFN + "/link-y") |