[autotest] Filter control files from deps and profilers in dynamic suites
These aren't tests, really, and as such the control files
are often malformed (as far as dynamic_suite.Suite's expectations
anyway). Filter them out, since they just create log spew.
BUG=chromium-os:30565
TEST=unit
TEST=run dev_harness; see that there are no more complaints about these files.
Change-Id: I4e03fb54c13d409f3e96af0f72636bf2a6158a76
Reviewed-on: https://gerrit.chromium.org/gerrit/22144
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>
diff --git a/server/cros/dynamic_suite_unittest.py b/server/cros/dynamic_suite_unittest.py
index 68cac86..44a8072 100755
--- a/server/cros/dynamic_suite_unittest.py
+++ b/server/cros/dynamic_suite_unittest.py
@@ -525,6 +525,10 @@
'two': FakeControlData('data_two'),
'three': FakeControlData('data_three')}
+ self.files_to_filter = {
+ 'with/deps/...': FakeControlData('...gets filtered'),
+ 'with/profilers/...': FakeControlData('...gets filtered')}
+
def tearDown(self):
super(SuiteTest, self).tearDown()
@@ -533,7 +537,8 @@
def expect_control_file_parsing(self):
"""Expect an attempt to parse the 'control files' in |self.files|."""
- self.getter.get_control_file_list().AndReturn(self.files.keys())
+ all_files = self.files.keys() + self.files_to_filter.keys()
+ self.getter.get_control_file_list().AndReturn(all_files)
self.mox.StubOutWithMock(control_data, 'parse_control_string')
for file, data in self.files.iteritems():
self.getter.get_control_file_contents(file).AndReturn(data.string)