swarmbucket: add bucket-level execution timeout

appengine/cr-buildbucket/swarming/test/swarming_test.py

 # Copyright 2015 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.
 
 import base64
 import contextlib
 import datetime
 import json
 
 from components import auth
@@ skipping 130 matching lines @@
       {'junk': 1},
       {'recipe': []},
       {'recipe': {'junk': 1}},
       {'recipe': {'revision': 1}},
     ]
     for p in bad:
       with self.assertRaises(errors.InvalidInputError):
         validate_swarming_param(p)
 
   def test_execution_timeout(self):
-    builder_cfg = project_config_pb2.Swarming.Builder(
-        name='fast-builder',
-        execution_timeout_secs=60,
-    )
+    self.bucket_cfg.swarming.common_execution_timeout_secs = 120
+    builder_cfg = project_config_pb2.Swarming.Builder(name='fast-builder')
 
     build = model.Build(
         bucket='bucket',
         parameters={
           'builder_name': 'fast-builder',
         },
     )
 
     task_def = swarming.create_task_def_async(
         self.bucket_cfg.swarming, builder_cfg, build).get_result()
 
     self.assertEqual(
+        task_def['properties']['execution_timeout_secs'], 120)
+
+    builder_cfg.execution_timeout_secs = 60
+    task_def = swarming.create_task_def_async(
+        self.bucket_cfg.swarming, builder_cfg, build).get_result()
+    self.assertEqual(
         task_def['properties']['execution_timeout_secs'], 60)
 
   def test_create_task_async(self):
     build = model.Build(
       bucket='bucket',
       tags=['builder:builder'],
       parameters={
         'builder_name': 'builder',
         'swarming': {
           'recipe': {'revision': 'badcoffee'},
@@ skipping 188 matching lines @@
         'status': model.BuildStatus.COMPLETED,
         'result': model.BuildResult.FAILURE,
         'failure_reason': model.FailureReason.INFRA_FAILURE,
       },
 
       {
         'task_result': {
           'state': 'TIMED_OUT',
         },
         'status': model.BuildStatus.COMPLETED,
-        'result': model.BuildResult.CANCELED,
-        'cancelation_reason': model.CancelationReason.TIMEOUT,
+        'result': model.BuildResult.FAILURE,
+        'failure_reason': model.FailureReason.INFRA_FAILURE,
       },
 
       {
         'task_result': {
           'state': 'EXPIRED',
         },
         'status': model.BuildStatus.COMPLETED,
         'result': model.BuildResult.CANCELED,
         'cancelation_reason': model.CancelationReason.TIMEOUT,
       },
@@ skipping 225 matching lines @@
     self.assertEqual(build.status, model.BuildStatus.COMPLETED)
     self.assertEqual(build.result, model.BuildResult.FAILURE)
     self.assertEqual(build.failure_reason, model.FailureReason.INFRA_FAILURE)
     self.assertIsNotNone(build.result_details)
     self.assertIsNone(build.lease_key)
     self.assertIsNotNone(build.complete_time)
 
 
 def b64json(data):
   return base64.b64encode(json.dumps(data))