mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix DeprecationWarnings in test suite

Browse source
This commit is contained in:
Antoine Pitrou 2013-12-21 22:19:46 +01:00
parent 17c93260a6
commit 492b9893e1
4 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/distutils/tests/test_dist.py
View file

@ -406,14 +406,14 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
PKG_INFO.seek(0) PKG_INFO.seek(0)
metadata.read_pkg_file(PKG_INFO) metadata.read_pkg_file(PKG_INFO)
self.assertEquals(metadata.name, "package") self.assertEqual(metadata.name, "package")
self.assertEquals(metadata.version, "1.0") self.assertEqual(metadata.version, "1.0")
self.assertEquals(metadata.description, "xxx") self.assertEqual(metadata.description, "xxx")
self.assertEquals(metadata.download_url, 'http://example.com') self.assertEqual(metadata.download_url, 'http://example.com')
self.assertEquals(metadata.keywords, ['one', 'two']) self.assertEqual(metadata.keywords, ['one', 'two'])
self.assertEquals(metadata.platforms, ['UNKNOWN']) self.assertEqual(metadata.platforms, ['UNKNOWN'])
self.assertEquals(metadata.obsoletes, None) self.assertEqual(metadata.obsoletes, None)
self.assertEquals(metadata.requires, ['foo']) self.assertEqual(metadata.requires, ['foo'])
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()

10
Lib/distutils/tests/test_upload.py
View file

@ -114,11 +114,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
# what did we send ? # what did we send ?
headers = dict(self.last_open.req.headers) headers = dict(self.last_open.req.headers)
self.assertEqual(headers['Content-length'], '2087') self.assertEqual(headers['Content-length'], '2087')
self.assert_(headers['Content-type'].startswith('multipart/form-data')) self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
self.assertEquals(self.last_open.req.get_method(), 'POST') self.assertEqual(self.last_open.req.get_method(), 'POST')
self.assertEquals(self.last_open.req.get_full_url(), self.assertEqual(self.last_open.req.get_full_url(),
'http://pypi.python.org/pypi') 'http://pypi.python.org/pypi')
self.assert_(b'xxx' in self.last_open.req.data) self.assertIn(b'xxx', self.last_open.req.data)
def test_suite(): def test_suite():
return unittest.makeSuite(uploadTestCase) return unittest.makeSuite(uploadTestCase)

14
Lib/test/test_shutil.py
View file

@ -742,15 +742,15 @@ class TestShutil(unittest.TestCase):
os.chmod(restrictive_subdir, 0o600) os.chmod(restrictive_subdir, 0o600)
shutil.copytree(src_dir, dst_dir) shutil.copytree(src_dir, dst_dir)
self.assertEquals(os.stat(src_dir).st_mode, os.stat(dst_dir).st_mode) self.assertEqual(os.stat(src_dir).st_mode, os.stat(dst_dir).st_mode)
self.assertEquals(os.stat(os.path.join(src_dir, 'permissive.txt')).st_mode, self.assertEqual(os.stat(os.path.join(src_dir, 'permissive.txt')).st_mode,
os.stat(os.path.join(dst_dir, 'permissive.txt')).st_mode) os.stat(os.path.join(dst_dir, 'permissive.txt')).st_mode)
self.assertEquals(os.stat(os.path.join(src_dir, 'restrictive.txt')).st_mode, self.assertEqual(os.stat(os.path.join(src_dir, 'restrictive.txt')).st_mode,
os.stat(os.path.join(dst_dir, 'restrictive.txt')).st_mode) os.stat(os.path.join(dst_dir, 'restrictive.txt')).st_mode)
restrictive_subdir_dst = os.path.join(dst_dir, restrictive_subdir_dst = os.path.join(dst_dir,
os.path.split(restrictive_subdir)[1]) os.path.split(restrictive_subdir)[1])
self.assertEquals(os.stat(restrictive_subdir).st_mode, self.assertEqual(os.stat(restrictive_subdir).st_mode,
os.stat(restrictive_subdir_dst).st_mode) os.stat(restrictive_subdir_dst).st_mode)
@unittest.skipIf(os.name == 'nt', 'temporarily disabled on Windows') @unittest.skipIf(os.name == 'nt', 'temporarily disabled on Windows')
@unittest.skipUnless(hasattr(os, 'link'), 'requires os.link') @unittest.skipUnless(hasattr(os, 'link'), 'requires os.link')

6
Lib/test/test_strftime.py
View file

@ -189,15 +189,15 @@ class Y1900Tests(unittest.TestCase):
@unittest.skipIf(sys.platform == "win32", "Doesn't apply on Windows") @unittest.skipIf(sys.platform == "win32", "Doesn't apply on Windows")
def test_y_before_1900_nonwin(self): def test_y_before_1900_nonwin(self):
self.assertEquals( self.assertEqual(
time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)), "99") time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)), "99")
def test_y_1900(self): def test_y_1900(self):
self.assertEquals( self.assertEqual(
time.strftime("%y", (1900, 1, 1, 0, 0, 0, 0, 0, 0)), "00") time.strftime("%y", (1900, 1, 1, 0, 0, 0, 0, 0, 0)), "00")
def test_y_after_1900(self): def test_y_after_1900(self):
self.assertEquals( self.assertEqual(
time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13") time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13")
def test_main(): def test_main():