commit c6b9ea40ffe03c4ed4905d0050702fdded0f316c
author Chris Sosa <sosa@chromium.org> Mon May 19 11:40:45 2014 -0700
committer Chris Sosa <sosa@chromium.org> Wed May 21 20:04:52 2014 +0000
tree 16a33184b0c5b5cf012988d4535b2948c19fa0ba
parent 4d6c9f368356ded8bf3881e5889779159dfb2373

Cherry-pick key part of https://chromium-review.googlesource.com/200243

This CL increases the timeout of all hwtesting on branches while also
decreasing their priorities.

BUG=chromium:373512
TEST=Unittests

Change-Id: I8931c7774208f328273ab10af56030cd2cfcb697
Reviewed-on: https://chromium-review.googlesource.com/200463
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>

buildbot/cbuildbot_config.py

diff --git a/buildbot/cbuildbot_config.py b/buildbot/cbuildbot_config.py
index 9bef3a8..06911c8 100755
--- a/buildbot/cbuildbot_config.py
+++ b/buildbot/cbuildbot_config.py
@@ -687,6 +687,7 @@
     default_dict.update(kwargs)
     return [cls(cls.DEFAULT_HW_TEST, **default_dict)]
 
+  # pylint: disable=W0613
   def __init__(self, suite, num=constants.HWTEST_DEFAULT_NUM,
                pool=constants.HWTEST_MACH_POOL, timeout=DEFAULT_HW_TEST_TIMEOUT,
                async=False, critical=False, fatal_timeouts=True,
@@ -695,12 +696,12 @@
     self.suite = suite
     self.num = num
     self.pool = pool
-    self.timeout = timeout
+    self.timeout = 10 * 60 * 60
     self.async = async
     self.critical = critical
     self.fatal_timeouts = fatal_timeouts
     self.file_bugs = file_bugs
-    self.priority = priority
+    self.priority = constants.HWTEST_DEFAULT_PRIORITY
 
   @property
   def timeout_mins(self):

buildbot/cbuildbot_config_unittest.py

diff --git a/buildbot/cbuildbot_config_unittest.py b/buildbot/cbuildbot_config_unittest.py
index 4c9e1be..a38820e 100755
--- a/buildbot/cbuildbot_config_unittest.py
+++ b/buildbot/cbuildbot_config_unittest.py
@@ -15,7 +15,6 @@
 from chromite.buildbot import cbuildbot_config
 from chromite.lib import cros_test_lib
 from chromite.lib import git
-from chromite.lib import parallel
 
 CHROMIUM_WATCHING_URL = ('http://src.chromium.org/chrome/trunk/tools/build/'
     'masters/master.chromium.chromiumos/master_chromiumos_cros_cfg.py')
@@ -208,7 +207,7 @@
     """Verify that hw test timeout is in a reasonable range."""
     # The parallel library will kill the process if it's silent for longer
     # than the silent timeout.
-    max_timeout = parallel._BackgroundTask.SILENT_TIMEOUT
+    max_timeout = 16 * 60 * 60
     for build_name, config in cbuildbot_config.config.iteritems():
       for test_config in config['hw_tests']:
         self.assertTrue(test_config.timeout < max_timeout,