diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 00:21:04 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-20 00:21:04 (GMT) |
| commit | 6709c0c6713e727f739200c7ed12a7b792e54fe6 (patch) | |
| tree | aacaf12d482abfdeebf5c8772833556753565aaf /Lib | |
| parent | bb30da9698e50bf33d2ab820fc876c6e9452e33b (diff) | |
| download | cpython-6709c0c6713e727f739200c7ed12a7b792e54fe6.zip cpython-6709c0c6713e727f739200c7ed12a7b792e54fe6.tar.gz cpython-6709c0c6713e727f739200c7ed12a7b792e54fe6.tar.bz2 | |
Merged revisions 79127 via svnmerge from
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.
........
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 2601c36..bac485f 100644 --- a/Lib/test/test_thread.py +++ b/Lib/test/test_thread.py @@ -63,10 +63,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 @@ -86,7 +86,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): @@ -115,7 +115,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 @@ -126,7 +126,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: @@ -199,7 +199,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.") + @support.reap_threads def test_forkinthread(self): def thread1(): try: |