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

Merged revisions 79127 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79127 | florent.xicluna | 2010-03-20 01:17:46 +0100 (sam, 20 mar 2010) | 2 lines

  #8178 Cleanup the threads after test_thread.TestForkInThread.
........
This commit is contained in:
Florent Xicluna 2010-03-20 00:21:04 +00:00
parent bb30da9698
commit 6709c0c671
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_thread.py
View file

@ -63,10 +63,10 @@ class ThreadRunningTests(BasicThreadTest):
def test_stack_size(self): def test_stack_size(self):
# Various stack size tests. # Various stack size tests.
self.assertEquals(thread.stack_size(), 0, "intial stack size is not 0") self.assertEqual(thread.stack_size(), 0, "initial stack size is not 0")
thread.stack_size(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"): if os.name not in ("nt", "os2", "posix"):
return return
@ -86,7 +86,7 @@ class ThreadRunningTests(BasicThreadTest):
fail_msg = "stack_size(%d) failed - should succeed" fail_msg = "stack_size(%d) failed - should succeed"
for tss in (262144, 0x100000, 0): for tss in (262144, 0x100000, 0):
thread.stack_size(tss) 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) verbose_print("successfully set stack_size(%d)" % tss)
for tss in (262144, 0x100000): for tss in (262144, 0x100000):
@ -115,7 +115,7 @@ class ThreadRunningTests(BasicThreadTest):
thread.start_new_thread(task, ()) thread.start_new_thread(task, ())
while not started: while not started:
time.sleep(0.01) time.sleep(0.01)
self.assertEquals(thread._count(), orig + 1) self.assertEqual(thread._count(), orig + 1)
# Allow the task to finish. # Allow the task to finish.
mut.release() mut.release()
# The only reliable way to be sure that the thread ended from the # The only reliable way to be sure that the thread ended from the
@ -126,7 +126,7 @@ class ThreadRunningTests(BasicThreadTest):
del task del task
while not done: while not done:
time.sleep(0.01) time.sleep(0.01)
self.assertEquals(thread._count(), orig) self.assertEqual(thread._count(), orig)
class Barrier: class Barrier:
@ -199,7 +199,8 @@ class TestForkInThread(unittest.TestCase):
self.read_fd, self.write_fd = os.pipe() self.read_fd, self.write_fd = os.pipe()
@unittest.skipIf(sys.platform.startswith('win'), @unittest.skipIf(sys.platform.startswith('win'),
"This test is only appropriate for POSIX-like systems.") "This test is only appropriate for POSIX-like systems.")
@support.reap_threads
def test_forkinthread(self): def test_forkinthread(self):
def thread1(): def thread1():
try: try: