swarmbucket: add execution_timeout_secs

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 16 matching lines @@
 def futuristic(result):
   f = ndb.Future()
   f.set_result(result)
   return f
 
 
 class SwarmingTest(testing.AppengineTestCase):
   def setUp(self):
     super(SwarmingTest, self).setUp()
     self.mock(utils, 'utcnow', lambda: datetime.datetime(2015, 11, 30))
-    bucket_cfg = project_config_pb2.Bucket(
+    self.bucket_cfg = project_config_pb2.Bucket(
       name='bucket',
       swarming=project_config_pb2.Swarming(
         hostname='chromium-swarm.appspot.com',
         url_format='https://example.com/{swarming_hostname}/{task_id}',
         common_swarming_tags=['commontag:yes'],
         common_dimensions=['cores:8', 'pool:default'],
         common_recipe=project_config_pb2.Swarming.Recipe(
           repository='https://example.com/repo',
           name='recipe',
         ),
         builders=[
           project_config_pb2.Swarming.Builder(
-            name='builder',
-            swarming_tags=['buildertag:yes'],
-            dimensions=['os:Linux', 'pool:Chrome'],
-            recipe=project_config_pb2.Swarming.Recipe(
-              properties=['predefined-property:x'],
-            ),
-            priority=108,
+              name='builder',
+              swarming_tags=['buildertag:yes'],
+              dimensions=['os:Linux', 'pool:Chrome'],
+              recipe=project_config_pb2.Swarming.Recipe(
+                  properties=['predefined-property:x'],
+              ),
+              priority=108,
           ),
         ],
       ),
     )
-    self.mock(config, 'get_bucket_async', lambda name: futuristic(bucket_cfg))
+    self.mock(
+        config, 'get_bucket_async', lambda name: futuristic(self.bucket_cfg))
 
     task_template = {
       'name': 'buildbucket-$bucket-$builder',
       'priority': '100',
       'expiration_secs': '3600',
       'properties': {
         'execution_timeout_secs': '3600',
         'inputs_ref': {
           'isolatedserver': 'https://isolateserver.appspot.com',
           'namespace': 'default-gzip',
@@ skipping 58 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,
+    )
+
+    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'], 60)
+
   def test_create_task_async(self):
     build = model.Build(
       bucket='bucket',
       tags=['builder:builder'],
       parameters={
         'builder_name': 'builder',
         'swarming': {
           'recipe': {'revision': 'badcoffee'},
         },
         'properties': {
@@ skipping 430 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))