add support for timeout option

1 files changed, 18 insertions, 6 deletions

diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py
index 4f84adf..8a0f34f 100755
--- a/build-scripts/post-build-lava.py
+++ b/build-scripts/post-build-lava.py
@@ -49,6 +49,7 @@ PRODUCT_MAP = {
 }
 
 OPTION_SUFFIX = "_OPTION"
+TIMEOUT_SUFFIX = "_TIMEOUT"
 
 
 def gen_lava_android_test_actions(tests=[]):
@@ -71,6 +72,11 @@ def gen_lava_android_test_actions(tests=[]):
         if test_option:
             parameters['option'] = test_option
 
+        timeout_option = os.environ.get('%s%s' % (test.upper(),
+                                                  TIMEOUT_SUFFIX))
+        if timeout_option:
+            parameters['timeout'] = timeout_option
+
         run_action = {
                       "command": "lava_android_test_run",
                       "parameters": parameters
@@ -91,7 +97,7 @@ def gen_test_plan_actions():
     return gen_lava_android_test_actions(test_plans)
 
 
-def gen_command_action(commands=[], cmd_file=None, parser=None):
+def gen_command_action(commands=[], cmd_file=None, parser=None, timeout=None):
     parameters = None
     if commands:
         parameters = {'commands': commands}
@@ -101,6 +107,9 @@ def gen_command_action(commands=[], cmd_file=None, parser=None):
     if parameters and parser:
         parameters['parser'] = parser
 
+    if timeout:
+        parameters['timeout'] = timeout
+
     action = {"command": "lava_android_test_run_custom",
               "parameters": parameters}
     return action
@@ -119,8 +128,10 @@ def gen_custom_actions():
     for var in test_list:
         cmd = os.environ.get(var)
         pattern = os.environ.get('%s%s' % (var, pat_suffix))
+        timeout = os.environ.get('%s%s' % (var, TIMEOUT_SUFFIX))
         test_actions.append(gen_command_action(commands=[cmd],
-                                                parser=pattern))
+                                                parser=pattern,
+                                                timeout=timeout))
 
     return test_actions
 
@@ -135,12 +146,13 @@ def gen_monkeyrunner_actions():
     test_list.sort()
     for var in test_list:
         url = os.environ.get(var)
+        parameters = {"url": url}
+        timeout = os.environ.get('%s%s' % (var, TIMEOUT_SUFFIX))
+        if timeout:
+            parameters['timeout'] = timeout
         action = {
                     "command": "lava_android_test_run_monkeyrunner",
-                    "parameters":
-                            {
-                                 "url": url
-                            }
+                    "parameters": parameters
                  }
         test_actions.append(action)
     return test_actions