| 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 glob | 5 import glob |
| 6 import logging | 6 import logging |
| 7 import os | 7 import os |
| 8 import sys | 8 import sys |
| 9 | 9 |
| 10 from base_test_runner import BaseTestRunner | 10 from base_test_runner import BaseTestRunner |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 """Returns a list of data files/dirs needed by the test suite.""" | 150 """Returns a list of data files/dirs needed by the test suite.""" |
| 151 # Ideally, we'd just push all test data. However, it has >100MB, and a lot | 151 # Ideally, we'd just push all test data. However, it has >100MB, and a lot |
| 152 # of the files are not relevant (some are used for browser_tests, others for | 152 # of the files are not relevant (some are used for browser_tests, others for |
| 153 # features not supported, etc..). | 153 # features not supported, etc..). |
| 154 if self.test_package.test_suite_basename in ['base_unittests', | 154 if self.test_package.test_suite_basename in ['base_unittests', |
| 155 'sql_unittests', | 155 'sql_unittests', |
| 156 'unit_tests']: | 156 'unit_tests']: |
| 157 test_files = [ | 157 test_files = [ |
| 158 'base/data/file_util_unittest', | 158 'base/data/file_util_unittest', |
| 159 'base/data/json/bom_feff.json', | 159 'base/data/json/bom_feff.json', |
| 160 'base/prefs/test/data/pref_service', |
| 160 'chrome/test/data/download-test1.lib', | 161 'chrome/test/data/download-test1.lib', |
| 161 'chrome/test/data/extensions/bad_magic.crx', | 162 'chrome/test/data/extensions/bad_magic.crx', |
| 162 'chrome/test/data/extensions/good.crx', | 163 'chrome/test/data/extensions/good.crx', |
| 163 'chrome/test/data/extensions/icon1.png', | 164 'chrome/test/data/extensions/icon1.png', |
| 164 'chrome/test/data/extensions/icon2.png', | 165 'chrome/test/data/extensions/icon2.png', |
| 165 'chrome/test/data/extensions/icon3.png', | 166 'chrome/test/data/extensions/icon3.png', |
| 166 'chrome/test/data/extensions/allow_silent_upgrade/', | 167 'chrome/test/data/extensions/allow_silent_upgrade/', |
| 167 'chrome/test/data/extensions/app/', | 168 'chrome/test/data/extensions/app/', |
| 168 'chrome/test/data/extensions/bad/', | 169 'chrome/test/data/extensions/bad/', |
| 169 'chrome/test/data/extensions/effective_host_permissions/', | 170 'chrome/test/data/extensions/effective_host_permissions/', |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 self.tool.CleanUpEnvironment() | 367 self.tool.CleanUpEnvironment() |
| 367 if self.test_package.cleanup_test_files: | 368 if self.test_package.cleanup_test_files: |
| 368 self.adb.RemovePushedFiles() | 369 self.adb.RemovePushedFiles() |
| 369 if self.dump_debug_info: | 370 if self.dump_debug_info: |
| 370 self.dump_debug_info.StopRecordingLog() | 371 self.dump_debug_info.StopRecordingLog() |
| 371 if self._performance_test_setup: | 372 if self._performance_test_setup: |
| 372 self._performance_test_setup.TearDown() | 373 self._performance_test_setup.TearDown() |
| 373 if self.dump_debug_info: | 374 if self.dump_debug_info: |
| 374 self.dump_debug_info.ArchiveNewCrashFiles() | 375 self.dump_debug_info.ArchiveNewCrashFiles() |
| 375 super(SingleTestRunner, self).TearDown() | 376 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |