summaryrefslogtreecommitdiff
path: root/Lib/distutils/tests/test_check.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-21 01:30:29 +0000
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-21 01:30:29 +0000
commit19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee (patch)
tree596b5a2c45b058ea3e0cdc49cb7539a21410b98d /Lib/distutils/tests/test_check.py
parentb65b4937e20be4a2d3311326909c77bbf2e1c4cd (diff)
downloadcpython-git-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.gz
Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line #9424: Replace deprecated assert* methods in the Python test suite. ........
Diffstat (limited to 'Lib/distutils/tests/test_check.py')
-rw-r--r--Lib/distutils/tests/test_check.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py
index 372bae367b..7c56c04339 100644
--- a/Lib/distutils/tests/test_check.py
+++ b/Lib/distutils/tests/test_check.py
@@ -26,7 +26,7 @@ class CheckTestCase(support.LoggingSilencer,
# by default, check is checking the metadata
# should have some warnings
cmd = self._run()
- self.assertEquals(cmd._warnings, 2)
+ self.assertEqual(cmd._warnings, 2)
# now let's add the required fields
# and run it again, to make sure we don't get
@@ -35,7 +35,7 @@ class CheckTestCase(support.LoggingSilencer,
'author_email': 'xxx',
'name': 'xxx', 'version': 'xxx'}
cmd = self._run(metadata)
- self.assertEquals(cmd._warnings, 0)
+ self.assertEqual(cmd._warnings, 0)
# now with the strict mode, we should
# get an error if there are missing metadata
@@ -43,7 +43,7 @@ class CheckTestCase(support.LoggingSilencer,
# and of course, no error when all metadata are present
cmd = self._run(metadata, strict=1)
- self.assertEquals(cmd._warnings, 0)
+ self.assertEqual(cmd._warnings, 0)
def test_check_document(self):
if not HAS_DOCUTILS: # won't test without docutils
@@ -54,12 +54,12 @@ class CheckTestCase(support.LoggingSilencer,
# let's see if it detects broken rest
broken_rest = 'title\n===\n\ntest'
msgs = cmd._check_rst_data(broken_rest)
- self.assertEquals(len(msgs), 1)
+ self.assertEqual(len(msgs), 1)
# and non-broken rest
rest = 'title\n=====\n\ntest'
msgs = cmd._check_rst_data(rest)
- self.assertEquals(len(msgs), 0)
+ self.assertEqual(len(msgs), 0)
def test_check_restructuredtext(self):
if not HAS_DOCUTILS: # won't test without docutils
@@ -69,7 +69,7 @@ class CheckTestCase(support.LoggingSilencer,
pkg_info, dist = self.create_dist(long_description=broken_rest)
cmd = check(dist)
cmd.check_restructuredtext()
- self.assertEquals(cmd._warnings, 1)
+ self.assertEqual(cmd._warnings, 1)
# let's see if we have an error with strict=1
metadata = {'url': 'xxx', 'author': 'xxx',
@@ -82,7 +82,7 @@ class CheckTestCase(support.LoggingSilencer,
# and non-broken rest
metadata['long_description'] = 'title\n=====\n\ntest'
cmd = self._run(metadata, strict=1, restructuredtext=1)
- self.assertEquals(cmd._warnings, 0)
+ self.assertEqual(cmd._warnings, 0)
def test_check_all(self):