[autotest] Clean up logging
The logging messages was split between helper functions, making it
hard to tell in what context the logging messages were being emitted,
so move the logging messages to the same level.
BUG=chromium:672348
TEST=None
Change-Id: Ibe11d1b0da88639d7de1f006e8146007e84cc964
Reviewed-on: https://chromium-review.googlesource.com/452675
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/server/cros/dynamic_suite/suite.py b/server/cros/dynamic_suite/suite.py
index 55eee22..afa46bb 100644
--- a/server/cros/dynamic_suite/suite.py
+++ b/server/cros/dynamic_suite/suite.py
@@ -507,15 +507,12 @@
@returns a dictionary of ControlData objects that based on given
parameters.
"""
- logging.debug('Getting control file list for suite: %s', suite_name)
if _should_batch_with(cf_getter):
suite_info = cf_getter.get_suite_info(suite_name=suite_name)
files = suite_info.keys()
else:
files = cf_getter.get_control_file_list(suite_name=suite_name)
-
- logging.debug('Parsing control files ...')
matcher = re.compile(r'[^/]+/(deps|profilers)/.+')
filtered_files = (path for path in files if not matcher.match(path))
if _should_batch_with(cf_getter):
@@ -848,6 +845,7 @@
file text added in |text| attribute. Results are sorted based
on the TIME setting in control file, slowest test comes first.
"""
+ logging.debug('Getting control file list for suite: %s', suite_name)
tests = _find_test_control_data_for_suite(
cf_getter, suite_name, forgiving_parser,
run_prod_code=run_prod_code, test_args=test_args)
@@ -884,6 +882,7 @@
@return list of top names that similar to the given test, sorted by
match ratio.
"""
+ logging.debug('Getting control file list for suite: %s', suite_name)
tests = _find_test_control_data_for_suite(
cf_getter, suite_name, forgiving_parser=True)
logging.debug('Parsed %s control files.', len(tests))
