| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 from base_test_runner import BaseTestRunner | 9 from base_test_runner import BaseTestRunner |
| 10 import debug_info | 10 import debug_info |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 | 137 |
| 138 def GetDataFilesForTestSuite(self): | 138 def GetDataFilesForTestSuite(self): |
| 139 """Returns a list of data files/dirs needed by the test suite.""" | 139 """Returns a list of data files/dirs needed by the test suite.""" |
| 140 # Ideally, we'd just push all test data. However, it has >100MB, and a lot | 140 # Ideally, we'd just push all test data. However, it has >100MB, and a lot |
| 141 # of the files are not relevant (some are used for browser_tests, others for | 141 # of the files are not relevant (some are used for browser_tests, others for |
| 142 # features not supported, etc..). | 142 # features not supported, etc..). |
| 143 if self.test_package.test_suite_basename in ['base_unittests', | 143 if self.test_package.test_suite_basename in ['base_unittests', |
| 144 'sql_unittests', | 144 'sql_unittests', |
| 145 'unit_tests']: | 145 'unit_tests']: |
| 146 return [ | 146 return [ |
| 147 'base/data/json/bom_feff.json', |
| 147 'net/data/cache_tests/insert_load1', | 148 'net/data/cache_tests/insert_load1', |
| 148 'net/data/cache_tests/dirty_entry5', | 149 'net/data/cache_tests/dirty_entry5', |
| 149 'ui/base/test/data/data_pack_unittest', | 150 'ui/base/test/data/data_pack_unittest', |
| 150 'chrome/test/data/bookmarks/History_with_empty_starred', | 151 'chrome/test/data/bookmarks/History_with_empty_starred', |
| 151 'chrome/test/data/bookmarks/History_with_starred', | 152 'chrome/test/data/bookmarks/History_with_starred', |
| 152 'chrome/test/data/extensions/json_schema_test.js', | 153 'chrome/test/data/extensions/json_schema_test.js', |
| 153 'chrome/test/data/History/', | 154 'chrome/test/data/History/', |
| 154 'chrome/test/data/json_schema_validator/', | 155 'chrome/test/data/json_schema_validator/', |
| 155 'chrome/test/data/serializer_nested_test.js', | 156 'chrome/test/data/serializer_nested_test.js', |
| 156 'chrome/test/data/serializer_test.js', | 157 'chrome/test/data/serializer_test.js', |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 def TearDown(self): | 300 def TearDown(self): |
| 300 """Cleans up the test enviroment for the test suite.""" | 301 """Cleans up the test enviroment for the test suite.""" |
| 301 self.test_package.tool.CleanUpEnvironment() | 302 self.test_package.tool.CleanUpEnvironment() |
| 302 if self.test_package.cleanup_test_files: | 303 if self.test_package.cleanup_test_files: |
| 303 self.adb.RemovePushedFiles() | 304 self.adb.RemovePushedFiles() |
| 304 if self.dump_debug_info: | 305 if self.dump_debug_info: |
| 305 self.dump_debug_info.StopRecordingLog() | 306 self.dump_debug_info.StopRecordingLog() |
| 306 if self.test_package.performance_test: | 307 if self.test_package.performance_test: |
| 307 self.adb.TearDownPerformanceTest() | 308 self.adb.TearDownPerformanceTest() |
| 308 super(SingleTestRunner, self).TearDown() | 309 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |