[autotest] Continuing refactor of dynamic_suite code; splitting monster files!
Split the biiiiig dynamic_suite.py and dynamic_suite_unittest.py into separate
files for Reimager and Suite. Adjust imports to compensate.
BUG=chromium-os:30266
TEST=unit
TEST=successful run_suite.py run
TEST=suite_enumerator.py, suite_preprocessor.py,
Change-Id: I0457053a7ae1422970138619a64edbcfbbc338bc
Reviewed-on: https://gerrit.chromium.org/gerrit/30457
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>
diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index 6065360..f3bc206 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -10,9 +10,10 @@
import sys
from autotest_lib.client.common_lib import error, global_config
from autotest_lib.client.common_lib.cros import dev_server
+from autotest_lib.server.cros.dynamic_suite import constants
from autotest_lib.server.cros.dynamic_suite import control_file_getter
-from autotest_lib.server.cros.dynamic_suite import dynamic_suite
from autotest_lib.server.cros.dynamic_suite import job_status
+from autotest_lib.server.cros.dynamic_suite import tools
# Relevant CrosDynamicSuiteExceptions are defined in client/common_lib/error.py.
@@ -115,13 +116,13 @@
# on the dev server. However set synchronous to False to allow other
# components to be downloaded in the background.
ds = dev_server.DevServer.create()
- timings[dynamic_suite.DOWNLOAD_STARTED_TIME] = formatted_now()
+ timings[constants.DOWNLOAD_STARTED_TIME] = formatted_now()
try:
ds.trigger_download(build, synchronous=False)
except dev_server.DevServerException as e:
raise error.StageBuildFailure(
"Failed to stage %s for %s: %s" % (build, board, e))
- timings[dynamic_suite.PAYLOAD_FINISHED_TIME] = formatted_now()
+ timings[constants.PAYLOAD_FINISHED_TIME] = formatted_now()
control_file_in = get_control_file_contents_by_name(build, board, ds,
suite_name)
@@ -133,7 +134,7 @@
'check_hosts': check_hosts,
'pool': pool,
'num': numeric_num}
- control_file = dynamic_suite.inject_vars(inject_dict, control_file_in)
+ control_file = tools.inject_vars(inject_dict, control_file_in)
return _rpc_utils().create_job_common('%s-%s' % (build, suite_name),
priority='Medium',