[autotest] Remove experimental tests filter
BUG=None
TEST=None
Change-Id: I3771f4e1c525d98a516c193ec3ae15f66269af27
Reviewed-on: https://chromium-review.googlesource.com/508433
Commit-Ready: Allen Li <[email protected]>
Tested-by: Allen Li <[email protected]>
Reviewed-by: Allen Li <[email protected]>
diff --git a/server/cros/dynamic_suite/suite.py b/server/cros/dynamic_suite/suite.py
index 138abf5..25ff089 100644
--- a/server/cros/dynamic_suite/suite.py
+++ b/server/cros/dynamic_suite/suite.py
@@ -251,52 +251,6 @@
return self._retry_map[job_id]['retry_max']
-class _ExperimentalTestFilter(object):
- """Filter experimental tests."""
-
-
- def __init__(self, tests, add_experimental=True):
- """Initialize instance.
-
- @param tests: iterable of tests (ControlData objects)
- @param add_experimental: schedule experimental tests as well, or not.
- """
- self._tests = list(tests)
- self._add_experimental = add_experimental
-
-
- def get_tests_to_schedule(self):
- """Return a list of tests to be scheduled for this suite.
-
- @returns: list of tests (ControlData objects)
- """
- tests = self.stable_tests
- if self._add_experimental:
- for test in self.unstable_tests:
- if not test.name.startswith(constants.EXPERIMENTAL_PREFIX):
- test.name = constants.EXPERIMENTAL_PREFIX + test.name
- tests.append(test)
- return tests
-
-
- @property
- def stable_tests(self):
- """Non-experimental tests.
-
- @returns: list
- """
- return filter(lambda t: not t.experimental, self._tests)
-
-
- @property
- def unstable_tests(self):
- """Experimental tests.
-
- @returns: list
- """
- return filter(lambda t: t.experimental, self._tests)
-
-
class _SuiteChildJobCreator(object):
"""Create test jobs for a suite."""
@@ -1171,7 +1125,7 @@
return job
- def schedule(self, record, add_experimental=True):
+ def schedule(self, record):
#pylint: disable-msg=C0111
"""
Schedule jobs using |self._afe|.
@@ -1181,17 +1135,10 @@
@param record: A callable to use for logging.
prototype: record(base_job.status_log_entry)
- @param add_experimental: schedule experimental tests as well, or not.
@returns: The number of tests that were scheduled.
"""
scheduled_test_names = []
- test_filter = _ExperimentalTestFilter(
- tests=self.tests,
- add_experimental=add_experimental)
- logging.debug('Discovered %d stable tests.',
- len(test_filter.stable_tests))
- logging.debug('Discovered %d unstable tests.',
- len(test_filter.unstable_tests))
+ logging.debug('Discovered %d tests.', len(self.tests))
Status('INFO', 'Start %s' % self._tag).record_result(record)
try:
@@ -1199,13 +1146,12 @@
if self._job_keyvals:
utils.write_keyval(self._results_dir, self._job_keyvals)
- tests = test_filter.get_tests_to_schedule()
# TODO(crbug.com/730885): This is a hack to protect tests that are
# not usually retried from getting hit by a provision error when run
# as part of a suite. Remove this hack once provision is separated
# out in its own suite.
- self._bump_up_test_retries(tests)
- for test in tests:
+ self._bump_up_test_retries(self.tests)
+ for test in self.tests:
scheduled_job = self._schedule_test(record, test)
if scheduled_job is not None:
scheduled_test_names.append(test.name)
diff --git a/server/cros/dynamic_suite/suite_unittest.py b/server/cros/dynamic_suite/suite_unittest.py
index c7ea87f..c515b6d 100755
--- a/server/cros/dynamic_suite/suite_unittest.py
+++ b/server/cros/dynamic_suite/suite_unittest.py
@@ -458,7 +458,7 @@
self.devserver,
afe=self.afe, tko=self.tko,
job_retry=True)
- suite.schedule(recorder.record_entry, add_experimental=True)
+ suite.schedule(recorder.record_entry)
self.assertEqual(expected_retry_map, suite._retry_handler._retry_map)
diff --git a/site_utils/test_runner_utils.py b/site_utils/test_runner_utils.py
index 4548325..1eebcc7 100755
--- a/site_utils/test_runner_utils.py
+++ b/site_utils/test_runner_utils.py
@@ -522,8 +522,7 @@
for suite, description in suites_and_descriptions:
logging.info('Scheduling suite for %s...', description)
ntests = suite.schedule(
- lambda log_entry, log_in_subdir=False: None,
- add_experimental=not no_experimental)
+ lambda log_entry, log_in_subdir=False: None)
logging.info('... scheduled %s job(s).', ntests)
if not afe.get_jobs():
