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.
........
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index f2277c9..1b1167a 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -25,9 +25,6 @@
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 @@
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 @@
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")