commit 86f8c28cffd04304ab83c74f51e03ad9fe7a7df3
author Allen Li <ayatane@chromium.org> Tue Feb 28 13:09:40 2017 -0800
committer chrome-bot <chrome-bot@chromium.org> Thu Mar 30 19:33:09 2017 -0700
tree 3c2635d98963d2543e53eb3f3475fbf6aaaec149
parent 3bf8782ffa0e617fdb678105997791b4576f0be6

[autotest] Rename suite discoverer to test filter

The original name doesnt accurately describe what the class is doing.

BUG=chromium:672348
TEST=None

Change-Id: I9e5dab682f212700d50598d6759c9269eec12d37
Reviewed-on: https://chromium-review.googlesource.com/447784
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>

server/cros/dynamic_suite/suite.py

diff --git a/server/cros/dynamic_suite/suite.py b/server/cros/dynamic_suite/suite.py
index b12dc20..c7cd597 100644
--- a/server/cros/dynamic_suite/suite.py
+++ b/server/cros/dynamic_suite/suite.py
@@ -252,8 +252,8 @@
         return self._retry_map[job_id]['retry_max']
 
 
-class _DynamicSuiteDiscoverer(object):
-    """Test discoverer for dynamic suite tests."""
+class _ExperimentalTestFilter(object):
+    """Filter experimental tests."""
 
 
     def __init__(self, tests, add_experimental=True):
@@ -266,7 +266,7 @@
         self._add_experimental = add_experimental
 
 
-    def discover_tests(self):
+    def get_tests_to_schedule(self):
         """Return a list of tests to be scheduled for this suite.
 
         @returns: list of tests (ControlData objects)
@@ -935,13 +935,13 @@
         @returns: The number of tests that were scheduled.
         """
         scheduled_test_names = []
-        discoverer = _DynamicSuiteDiscoverer(
+        test_filter = _ExperimentalTestFilter(
                 tests=self.tests,
                 add_experimental=add_experimental)
         logging.debug('Discovered %d stable tests.',
-                      len(discoverer.stable_tests))
+                      len(test_filter.stable_tests))
         logging.debug('Discovered %d unstable tests.',
-                      len(discoverer.unstable_tests))
+                      len(test_filter.unstable_tests))
 
         Status('INFO', 'Start %s' % self._tag).record_result(record)
         try:
@@ -949,7 +949,7 @@
             if self._job_keyvals:
                 utils.write_keyval(self._results_dir, self._job_keyvals)
 
-            for test in discoverer.discover_tests():
+            for test in test_filter.get_tests_to_schedule():
                 scheduled_job = self._schedule_test(record, test)
                 if scheduled_job is not None:
                     scheduled_test_names.append(test.name)

server/cros/dynamic_suite/suite_unittest.py

diff --git a/server/cros/dynamic_suite/suite_unittest.py b/server/cros/dynamic_suite/suite_unittest.py
index 31d23f7..b8703d9 100755
--- a/server/cros/dynamic_suite/suite_unittest.py
+++ b/server/cros/dynamic_suite/suite_unittest.py
@@ -257,7 +257,7 @@
         self.assertFalse(self.files['four'] in suite.tests)
         self.assertTrue(self.files['five'] in suite.tests)
 
-        discoverer = SuiteBase._DynamicSuiteDiscoverer(suite.tests)
+        discoverer = SuiteBase._ExperimentalTestFilter(suite.tests)
         self.assertFalse(self.files['one'] in discoverer.unstable_tests)
         self.assertFalse(self.files['two'] in discoverer.stable_tests)
         self.assertFalse(self.files['one'] in discoverer.stable_tests)
@@ -278,7 +278,7 @@
         # Sanity check.
         self.assertFalse(self.files['four'] in suite.tests)
 
-        discoverer = SuiteBase._DynamicSuiteDiscoverer(suite.tests)
+        discoverer = SuiteBase._ExperimentalTestFilter(suite.tests)
         self.assertTrue(self.files['one'] in discoverer.unstable_tests)
         self.assertTrue(self.files['two'] in discoverer.stable_tests)
         self.assertFalse(self.files['one'] in discoverer.stable_tests)