mirror of
https://github.com/python/cpython.git
synced 2025-07-29 22:24:49 +00:00
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. ........
This commit is contained in:
parent
b65b4937e2
commit
19f2aeba67
164 changed files with 2281 additions and 2279 deletions
|
@ -99,8 +99,8 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin):
|
|||
LifoQueue = [222, 333, 111],
|
||||
PriorityQueue = [111, 222, 333])
|
||||
actual_order = [q.get(), q.get(), q.get()]
|
||||
self.assertEquals(actual_order, target_order[q.__class__.__name__],
|
||||
"Didn't seem to queue the correct data!")
|
||||
self.assertEqual(actual_order, target_order[q.__class__.__name__],
|
||||
"Didn't seem to queue the correct data!")
|
||||
for i in range(QUEUE_SIZE-1):
|
||||
q.put(i)
|
||||
self.assertTrue(q.qsize(), "Queue should not be empty")
|
||||
|
@ -158,8 +158,8 @@ class BaseQueueTest(unittest.TestCase, BlockingTestMixin):
|
|||
for i in range(100):
|
||||
q.put(i)
|
||||
q.join()
|
||||
self.assertEquals(self.cum, sum(range(100)),
|
||||
"q.join() did not block until all tasks were done")
|
||||
self.assertEqual(self.cum, sum(range(100)),
|
||||
"q.join() did not block until all tasks were done")
|
||||
for i in (0,1):
|
||||
q.put(-1) # instruct the threads to close
|
||||
q.join() # verify that you can join twice
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue