commit a26332f4e0a1a15508a81265fb0e3b8ada44c95b
author Daniel Erat <derat@chromium.org> Thu May 25 14:10:53 2017 -0600
committer chrome-bot <chrome-bot@chromium.org> Fri May 26 09:47:44 2017 -0700
tree b9fd3a1729fffbf045d28571563f4a21368d80ec
parent 48276a0e48120b9dbb6305ccbb478f681fb54698

autotest: Remove unused dynamic_suite timeout arg.

Remove dynamic_suite.SuiteSpec's timeout arg, which has been
deprecated in favor of timeout_mins. Also remove an unused
DEFAULT_TRY_JOB_TIMEOUT_MINS constant.

BUG=chromium:714865
TEST=dynamic_suite_unittest.py passes

Change-Id: I0709b5c17a323cf2edf9f2b7095d929f4313e03d
Reviewed-on: https://chromium-review.googlesource.com/516202
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>

server/cros/dynamic_suite/dynamic_suite.py

diff --git a/server/cros/dynamic_suite/dynamic_suite.py b/server/cros/dynamic_suite/dynamic_suite.py
index cb33f22..477cdfe 100644
--- a/server/cros/dynamic_suite/dynamic_suite.py
+++ b/server/cros/dynamic_suite/dynamic_suite.py
@@ -17,7 +17,6 @@
 from autotest_lib.server.cros import provision
 from autotest_lib.server.cros.dynamic_suite import constants
 from autotest_lib.server.cros.dynamic_suite import frontend_wrappers
-from autotest_lib.server.cros.dynamic_suite import tools
 from autotest_lib.server.cros.dynamic_suite.suite import Suite
 from autotest_lib.tko import utils as tko_utils
 
@@ -194,8 +193,6 @@
 """
 
 
-DEFAULT_TRY_JOB_TIMEOUT_MINS = tools.try_job_timeout_mins()
-
 # Relevant CrosDynamicSuiteExceptions are defined in client/common_lib/error.py.
 
 class SuiteSpec(object):
@@ -228,9 +225,7 @@
             file_bugs=False,
             file_experimental_bugs=False,
             max_runtime_mins=24*60,
-            # TODO(derat): Remove this in favor of timeout_mins; it's unused.
-            timeout=24,
-            timeout_mins=None,
+            timeout_mins=24*60,
             suite_dependencies=None,
             bug_template=None,
             priority=priorities.Priority.DEFAULT,
@@ -269,8 +264,6 @@
                                        this suite fail.
         @param max_runtime_mins: Max runtime in mins for each of the sub-jobs
                                  this suite will run.
-        @param timeout: Max lifetime in hours for each of the sub-jobs that this
-                        suite runs.
         @param timeout_mins: Max lifetime in minutes for each of the sub-jobs
                              that this suite runs.
         @param suite_dependencies: A list of strings of suite level
@@ -332,8 +325,7 @@
         self.file_experimental_bugs = file_experimental_bugs
         self.dependencies = {'': []}
         self.max_runtime_mins = max_runtime_mins
-        self.timeout_mins = timeout_mins or timeout * 60
-        self.timeout = timeout
+        self.timeout_mins = timeout_mins
         self.bug_template = {} if bug_template is None else bug_template
         self.priority = priority
         self.wait_for_results = wait_for_results