diff options
Diffstat (limited to 'catapult/devil/devil/utils/reraiser_thread_unittest.py')
| -rw-r--r-- | catapult/devil/devil/utils/reraiser_thread_unittest.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/catapult/devil/devil/utils/reraiser_thread_unittest.py b/catapult/devil/devil/utils/reraiser_thread_unittest.py index e3c4e6be..eb37456c 100644 --- a/catapult/devil/devil/utils/reraiser_thread_unittest.py +++ b/catapult/devil/devil/utils/reraiser_thread_unittest.py @@ -1,7 +1,6 @@ # Copyright 2013 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - """Unittests for reraiser_thread.py.""" import threading @@ -52,7 +51,7 @@ class TestReraiserThreadGroup(unittest.TestCase): ran[i] = True group = reraiser_thread.ReraiserThreadGroup( - [reraiser_thread.ReraiserThread(f, args=[i]) for i in range(5)]) + [reraiser_thread.ReraiserThread(f, args=[i]) for i in range(5)]) group.StartAll() group.JoinAll() for v in ran: @@ -75,8 +74,9 @@ class TestReraiserThreadGroup(unittest.TestCase): def testJoinRaise(self): def f(): raise TestException + group = reraiser_thread.ReraiserThreadGroup( - [reraiser_thread.ReraiserThread(f) for _ in xrange(5)]) + [reraiser_thread.ReraiserThread(f) for _ in xrange(5)]) group.StartAll() with self.assertRaises(TestException): group.JoinAll() @@ -84,10 +84,12 @@ class TestReraiserThreadGroup(unittest.TestCase): def testJoinTimeout(self): def f(): pass + event = threading.Event() def g(): event.wait() + group = reraiser_thread.ReraiserThreadGroup( [reraiser_thread.ReraiserThread(g), reraiser_thread.ReraiserThread(f)]) @@ -113,5 +115,6 @@ class TestRunAsync(unittest.TestCase): self.assertEqual(1, a) self.assertEqual(2, b) + if __name__ == '__main__': unittest.main() |