commit e234dbfe3f369632e00043ac12312351995a0045
author Dan Jacques <dnj@chromium.org> Wed Jan 20 17:55:16 2016 -0800
committer ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Thu Jan 21 04:42:11 2016 +0000
tree e69fee9f4919acaff08ec765404109a32ec06863
parent 7a0de6069e5f44f4ee776d2e6d67dccd32adc958

chromeos_config: Use release timeout on release.

Currently, the build timeout assertion asserts a constant timeout
value. However, the configuration chooses the timeout value based on the
IS_RELEASE_BRANCH configuration variable. Make the test also choose the
constant to assert based on IS_RELEASE_BRANCH.

BUG=chromium:579565
TEST=None

Change-Id: I79d215d2e7ad70ff0a68cff1c399b2fac8dc91d7
Reviewed-on: https://chromium-review.googlesource.com/322822
Reviewed-by: Josafat Garcia <josafat@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
Tested-by: Daniel Jacques <dnj@chromium.org>

cbuildbot/chromeos_config_unittest.py

diff --git a/cbuildbot/chromeos_config_unittest.py b/cbuildbot/chromeos_config_unittest.py
index 7ebf352..8939d97 100644
--- a/cbuildbot/chromeos_config_unittest.py
+++ b/cbuildbot/chromeos_config_unittest.py
@@ -715,7 +715,10 @@
       if config.build_type == constants.PFQ_TYPE:
         expected = 20 * 60
       elif config.build_type == constants.CANARY_TYPE:
-        expected = (7 * 60 + 50) * 60
+        if not chromeos_config.IS_RELEASE_BRANCH:
+          expected = (7 * 60 + 50) * 60
+        else:
+          expected = 12 * 60 * 60
       else:
         expected = 4 * 60 * 60