diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 00:17:46 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 00:17:46 (GMT) |
| commit | 2e6d2622bd793c0eda9e838bb12d98b02ab0db18 (patch) | |
| tree | 8dfdfc893b17e1a37df8caff9ba6c886fbacfa44 /Lib | |
| parent | b2efeff4a58df58623da87b2d8b943f39960b11e (diff) | |
| download | cpython-2e6d2622bd793c0eda9e838bb12d98b02ab0db18.zip cpython-2e6d2622bd793c0eda9e838bb12d98b02ab0db18.tar.gz cpython-2e6d2622bd793c0eda9e838bb12d98b02ab0db18.tar.bz2 | |
#8178 Cleanup the threads after test_thread.TestForkInThread.
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_thread.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py index b476317..33109ec 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -65,10 +65,10 @@ class ThreadRunningTests(BasicThreadTest): 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, "initial 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 @@ -88,7 +88,7 @@ class ThreadRunningTests(BasicThreadTest): 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): @@ -117,7 +117,7 @@ class ThreadRunningTests(BasicThreadTest): thread.start_new_thread(task, ()) while not started: time.sleep(0.01) - self.assertEquals(thread._count(), orig + 1) + self.assertEqual(thread._count(), orig + 1) # Allow the task to finish. mut.release() # The only reliable way to be sure that the thread ended from the @@ -128,7 +128,7 @@ class ThreadRunningTests(BasicThreadTest): del task while not done: time.sleep(0.01) - self.assertEquals(thread._count(), orig) + self.assertEqual(thread._count(), orig) class Barrier: @@ -202,7 +202,8 @@ class TestForkInThread(unittest.TestCase): self.read_fd, self.write_fd = os.pipe() @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 thread1(): try: |