Kaydet (Commit) 2e6d2622 authored tarafından Florent Xicluna's avatar Florent Xicluna

#8178 Cleanup the threads after test_thread.TestForkInThread.

üst b2efeff4
...@@ -65,10 +65,10 @@ class ThreadRunningTests(BasicThreadTest): ...@@ -65,10 +65,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
...@@ -88,7 +88,7 @@ class ThreadRunningTests(BasicThreadTest): ...@@ -88,7 +88,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):
...@@ -117,7 +117,7 @@ class ThreadRunningTests(BasicThreadTest): ...@@ -117,7 +117,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
...@@ -128,7 +128,7 @@ class ThreadRunningTests(BasicThreadTest): ...@@ -128,7 +128,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:
...@@ -203,6 +203,7 @@ class TestForkInThread(unittest.TestCase): ...@@ -203,6 +203,7 @@ class TestForkInThread(unittest.TestCase):
@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.")
@test_support.reap_threads
def test_forkinthread(self): def test_forkinthread(self):
def thread1(): def thread1():
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment