commit a1354372fd3b10c85c11154e500848fdf5db9c6b
author Nodir Turakulov <nodir@google.com> Fri Dec 14 14:12:55 2018 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Dec 14 22:57:21 2018 +0000
tree ec1a3377e61c2c258a17043ac808ed0a48bceeff
parent 8d892959141b6a470cabee09525b45c01264a56a

Tolerate float test_timeout_secs

See crbug.com/914996 for reasoning.

Bug: 914996
Change-Id: Ia5ad96e164aed716e581689561724be4d304f2db

recipes/fuchsia.py

diff --git a/recipes/fuchsia.py b/recipes/fuchsia.py
index c7cd7f3..6b1aa44 100644
--- a/recipes/fuchsia.py
+++ b/recipes/fuchsia.py
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 """Recipe for building Fuchsia and running tests."""
 
-from recipe_engine.config import Enum, List, Set
+from recipe_engine.config import Enum, List, Set, Single
 from recipe_engine.recipe_api import Property
 
 TARGETS = ['arm64', 'x64']
@@ -138,7 +138,7 @@
             default=True),
     'test_timeout_secs':
         Property(
-            kind=int,
+            kind=Single((int, float)),
             help='How long to wait until timing out on tests',
             default=40 * 60),
     'requires_secrets':
@@ -164,6 +164,7 @@
              run_host_tests, test_pool, environment_label, device_type,
              networking_for_tests, pave, test_timeout_secs, requires_secrets,
              gcs_bucket):
+  test_timeout_secs = int(test_timeout_secs)
   tryjob = api.properties.get('tryjob')
   upload_results = not tryjob and gcs_bucket