Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged revisions 78249 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Ezio Melotti 2010-02-20 09:47:55 +00:00
parent ef7d67214a
commit a11865b8c6
6 changed files with 25 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_bool.py
View file

@ -7,12 +7,6 @@
class BoolTest(unittest.TestCase):
def assertIs(self, a, b):
self.assertTrue(a is b)
def assertIsNot(self, a, b):
self.assertTrue(a is not b)
def test_subclass(self):
try:
class C(bool):

3
Lib/test/test_complex.py
View file

@ -65,9 +65,6 @@ def assertClose(self, x, y, eps=1e-9):
self.assertCloseAbs(x.real, y.real, eps)
self.assertCloseAbs(x.imag, y.imag, eps)
def assertIs(self, a, b):
self.assertTrue(a is b)
def check_div(self, x, y):
"""Compute complex z=x*y, and check that z/x==y and z/y==x."""
z = x * y

7
Lib/test/test_genericpath.py
View file

@ -5,9 +5,6 @@
class AllCommonTest(unittest.TestCase):
def assertIs(self, a, b):
self.assertTrue(a is b)
def test_commonprefix(self):
self.assertEqual(
genericpath.commonprefix([]),
@ -50,8 +47,8 @@ def test_time(self):
f.close()
self.assertEqual(d, b"foobar")
self.assertTrue(
genericpath.getctime(support.TESTFN) <=
self.assertLessEqual(
genericpath.getctime(support.TESTFN),
genericpath.getmtime(support.TESTFN)
)
finally:

38
Lib/test/test_macpath.py
View file

@ -29,12 +29,12 @@ def test_isabs(self):
def test_commonprefix(self):
commonprefix = macpath.commonprefix
self.assertTrue(commonprefix(["home:swenson:spam", "home:swen:spam"])
== "home:swen")
self.assertTrue(commonprefix([":home:swen:spam", ":home:swen:eggs"])
== ":home:swen:")
self.assertTrue(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")
self.assertTrue(commonprefix([b"home:swenson:spam", b"home:swen:spam"])
== b"home:swen")
@ -45,13 +45,13 @@ def test_commonprefix(self):
def test_split(self):
split = macpath.split
self.assertEquals(split("foo:bar"),
self.assertEqual(split("foo:bar"),
('foo:', 'bar'))
self.assertEquals(split("conky:mountpoint:foo:bar"),
self.assertEqual(split("conky:mountpoint:foo:bar"),
('conky:mountpoint:foo', 'bar'))
self.assertEquals(split(":"), ('', ''))
self.assertEquals(split(":conky:mountpoint:"),
self.assertEqual(split(":"), ('', ''))
self.assertEqual(split(":conky:mountpoint:"),
(':conky:mountpoint', ''))
self.assertEquals(split(b"foo:bar"),
@ -79,21 +79,21 @@ def test_join(self):
def test_splitdrive(self):
splitdrive = macpath.splitdrive
self.assertEquals(splitdrive("foo:bar"), ('', 'foo:bar'))
self.assertEquals(splitdrive(":foo:bar"), ('', ':foo:bar'))
self.assertEqual(splitdrive("foo:bar"), ('', 'foo:bar'))
self.assertEqual(splitdrive(":foo:bar"), ('', ':foo:bar'))
self.assertEquals(splitdrive(b"foo:bar"), (b'', b'foo:bar'))
self.assertEquals(splitdrive(b":foo:bar"), (b'', b':foo:bar'))
def test_splitext(self):
splitext = macpath.splitext
self.assertEquals(splitext(":foo.ext"), (':foo', '.ext'))
self.assertEquals(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
self.assertEquals(splitext(".ext"), ('.ext', ''))
self.assertEquals(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
self.assertEquals(splitext(":foo.ext:"), (':foo.ext:', ''))
self.assertEquals(splitext(""), ('', ''))
self.assertEquals(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
self.assertEqual(splitext(":foo.ext"), (':foo', '.ext'))
self.assertEqual(splitext("foo:foo.ext"), ('foo:foo', '.ext'))
self.assertEqual(splitext(".ext"), ('.ext', ''))
self.assertEqual(splitext("foo.ext:foo"), ('foo.ext:foo', ''))
self.assertEqual(splitext(":foo.ext:"), (':foo.ext:', ''))
self.assertEqual(splitext(""), ('', ''))
self.assertEqual(splitext("foo.bar.ext"), ('foo.bar', '.ext'))
self.assertEquals(splitext(b":foo.ext"), (b':foo', b'.ext'))
self.assertEquals(splitext(b"foo:foo.ext"), (b'foo:foo', b'.ext'))

10
Lib/test/test_posixpath.py
View file

@ -25,9 +25,6 @@ def tearDown(self):
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 @@ def test_time(self):
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 @@ def test_realpath_resolve_before_normalizing(self):
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")

3
Lib/test/test_richcmp.py
View file

@ -279,9 +279,6 @@ def test_dicts(self):
class ListTest(unittest.TestCase):
def assertIs(self, a, b):
self.assertTrue(a is b)
def test_coverage(self):
# exercise all comparisons for lists
x = [42]