commit 3432acdf46b3ac440cc775b65960c8e3c9a80d02
author David James <davidjames@chromium.org> Wed Nov 27 10:02:18 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 05 05:28:25 2013 +0000
tree 6fac9501bc518585530c92cf6165c0bd8bf000bb
parent 575c265e24e505a79e9f9c06e6555a7bdee5159e

chromite: Move Timeout* functions to chromite.lib.timeout_util.

BUG=chromium:323675
CQ-DEPEND=CL:178733
TEST=cbuildbot --buildbot --debug --remote runs on x86-alex-paladin,
     x86-mario-paladin, x86-mario-release
TEST=repo grep -E \
'cros_build_lib\.(Timeout|FatalTimeout|TimeoutDecorator|'\
'WaitForCondition|WaitForReturnValue|WaitForTreeStatus|'\
'IsTreeOpen|GetTreeStatus|SubCommandTimeout|Timeout|'\
'WaitForCondition|TreeOpen)'
TEST=all unit tests

Change-Id: Ida5b3b5be04a3b891da0f0c06db832d3d01be972
Reviewed-on: https://chromium-review.googlesource.com/178734
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index a3e60be..c08ce38 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -43,6 +43,7 @@
 from chromite.lib import patch as cros_patch
 from chromite.lib import parallel
 from chromite.lib import sudo
+from chromite.lib import timeout_util
 
 
 _DEFAULT_LOG_DIR = 'cbuildbot_logs'
@@ -1534,7 +1535,7 @@
     stack.Add(critical_section.ForkWatchdog)
 
     if options.timeout > 0:
-      stack.Add(cros_build_lib.FatalTimeout, options.timeout)
+      stack.Add(timeout_util.FatalTimeout, options.timeout)
 
     if not options.buildbot:
       build_config = cbuildbot_config.OverrideConfigForTrybot(