[autotest] Shorten method names
BUG=chromium:672348
TEST=None
Change-Id: Idc0f61aa31ee5841f3e089848b91da62f44022c3
Reviewed-on: https://chromium-review.googlesource.com/453274
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 1a3848e..712b177 100644
--- a/server/cros/dynamic_suite/suite.py
+++ b/server/cros/dynamic_suite/suite.py
@@ -539,8 +539,8 @@
@returns a dictionary of ControlData objects that based on given
parameters.
"""
- control_file_texts = self._get_control_file_texts_for_suite(suite_name)
- return self._parse_control_file_texts(control_file_texts)
+ control_file_texts = self._get_cf_texts_for_suite(suite_name)
+ return self._parse_cf_text_many(control_file_texts)
def _filter_cf_paths(self, paths):
@@ -553,7 +553,7 @@
return (path for path in paths if not matcher.match(path))
- def _get_control_file_texts_for_suite(self, suite_name):
+ def _get_cf_texts_for_suite(self, suite_name):
"""Get control file content for given suite.
@param suite_name: If specified, this method will attempt to restrain
@@ -566,7 +566,7 @@
yield path, self._cf_getter.get_control_file_contents(path)
- def _parse_control_file_texts(self, control_file_texts):
+ def _parse_cf_text_many(self, control_file_texts):
"""Parse control file texts.
@param control_file_texts: iterable of (path, text) pairs
@@ -578,7 +578,7 @@
if self._test_args:
text = tools.inject_vars(self._test_args, text)
try:
- found_test = self._parse_control_file_text(path, text)
+ found_test = self._parse_cf_text(path, text)
except control_data.ControlVariableException, e:
if not self._forgiving_parser:
msg = "Failed parsing %s\n%s" % (path, e)
@@ -591,7 +591,7 @@
return tests
- def _parse_control_file_text(self, path, text):
+ def _parse_cf_text(self, path, text):
"""Parse control file text.
This ignores forgiving_parser because we cannot return a
@@ -613,7 +613,7 @@
"""Subclass that can retrieve suite control files in batch."""
- def _get_control_file_texts_for_suite(self, suite_name):
+ def _get_cf_texts_for_suite(self, suite_name):
"""Get control file content for given suite.
@param suite_name: If specified, this method will attempt to restrain
