diff options
Diffstat (limited to 'catapult/devil/devil/utils/timeout_retry_unittest.py')
-rwxr-xr-x | catapult/devil/devil/utils/timeout_retry_unittest.py | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/catapult/devil/devil/utils/timeout_retry_unittest.py b/catapult/devil/devil/utils/timeout_retry_unittest.py index 0eeb31a4..cf97bb9b 100755 --- a/catapult/devil/devil/utils/timeout_retry_unittest.py +++ b/catapult/devil/devil/utils/timeout_retry_unittest.py @@ -2,7 +2,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 timeout_and_retry.py.""" import logging @@ -12,7 +11,6 @@ import unittest from devil.utils import reraiser_thread from devil.utils import timeout_retry - _DEFAULT_TIMEOUT = .1 @@ -29,8 +27,7 @@ class TestRun(unittest.TestCase): """Tests for timeout_retry.Run.""" def testRun(self): - self.assertTrue(timeout_retry.Run( - lambda x: x, 30, 3, [True], {})) + self.assertTrue(timeout_retry.Run(lambda x: x, 30, 3, [True], {})) def testTimeout(self): tries = [0] @@ -40,22 +37,34 @@ class TestRun(unittest.TestCase): time.sleep(1) self.assertRaises( - reraiser_thread.TimeoutError, timeout_retry.Run, _sleep, .01, 1, + reraiser_thread.TimeoutError, + timeout_retry.Run, + _sleep, + .01, + 1, error_log_func=logging.debug) self.assertEqual(tries[0], 2) def testRetries(self): tries = [0] self.assertRaises( - TestException, timeout_retry.Run, lambda: _CountTries(tries), - _DEFAULT_TIMEOUT, 3, error_log_func=logging.debug) + TestException, + timeout_retry.Run, + lambda: _CountTries(tries), + _DEFAULT_TIMEOUT, + 3, + error_log_func=logging.debug) self.assertEqual(tries[0], 4) def testNoRetries(self): tries = [0] self.assertRaises( - TestException, timeout_retry.Run, lambda: _CountTries(tries), - _DEFAULT_TIMEOUT, 0, error_log_func=logging.debug) + TestException, + timeout_retry.Run, + lambda: _CountTries(tries), + _DEFAULT_TIMEOUT, + 0, + error_log_func=logging.debug) self.assertEqual(tries[0], 1) def testReturnValue(self): @@ -70,7 +79,8 @@ class TestRun(unittest.TestCase): self.assertEqual(current_thread_group, timeout_retry.CurrentTimeoutThreadGroup()) return True - return reraiser_thread.RunAsync((InnerInnerFunc,))[0] + + return reraiser_thread.RunAsync((InnerInnerFunc, ))[0] self.assertTrue(timeout_retry.Run(InnerFunc, _DEFAULT_TIMEOUT, 3)) |