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.
........
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index f6ce1ae..a86f86b 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -61,10 +61,10 @@
def test_stack_size(self):
# Various stack size tests.
- self.assertEquals(thread.stack_size(), 0, "intial stack size is not 0")
+ self.assertEqual(thread.stack_size(), 0, "intial stack size is not 0")
thread.stack_size(0)
- self.assertEquals(thread.stack_size(), 0, "stack_size not reset to default")
+ self.assertEqual(thread.stack_size(), 0, "stack_size not reset to default")
if os.name not in ("nt", "os2", "posix"):
return
@@ -84,7 +84,7 @@
fail_msg = "stack_size(%d) failed - should succeed"
for tss in (262144, 0x100000, 0):
thread.stack_size(tss)
- self.assertEquals(thread.stack_size(), tss, fail_msg % tss)
+ self.assertEqual(thread.stack_size(), tss, fail_msg % tss)
verbose_print("successfully set stack_size(%d)" % tss)
for tss in (262144, 0x100000):