| 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 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 test_files += ['chrome/test/data/simple_open_search.xml'] | 191 test_files += ['chrome/test/data/simple_open_search.xml'] |
| 192 # The following are spell check data. Now only list the data under | 192 # The following are spell check data. Now only list the data under |
| 193 # third_party/hunspell_dictionaries which are used by unit tests. | 193 # third_party/hunspell_dictionaries which are used by unit tests. |
| 194 old_cwd = os.getcwd() | 194 old_cwd = os.getcwd() |
| 195 os.chdir(constants.CHROME_DIR) | 195 os.chdir(constants.CHROME_DIR) |
| 196 test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic') | 196 test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic') |
| 197 os.chdir(old_cwd) | 197 os.chdir(old_cwd) |
| 198 return test_files | 198 return test_files |
| 199 elif self.test_package.test_suite_basename == 'net_unittests': | 199 elif self.test_package.test_suite_basename == 'net_unittests': |
| 200 return [ | 200 return [ |
| 201 'chrome/test/data/animate1.gif', |
| 202 'chrome/test/data/simple.html', |
| 201 'net/data/cache_tests', | 203 'net/data/cache_tests', |
| 202 'net/data/filter_unittests', | 204 'net/data/filter_unittests', |
| 203 'net/data/ftp', | 205 'net/data/ftp', |
| 204 'net/data/proxy_resolver_v8_unittest', | 206 'net/data/proxy_resolver_v8_unittest', |
| 205 'net/data/ssl/certificates', | 207 'net/data/ssl/certificates', |
| 206 'net/data/url_request_unittest/', | 208 'net/data/url_request_unittest/', |
| 207 'net/data/proxy_script_fetcher_unittest' | 209 'net/data/proxy_script_fetcher_unittest' |
| 208 ] | 210 ] |
| 209 elif self.test_package.test_suite_basename == 'ui_tests': | 211 elif self.test_package.test_suite_basename == 'ui_tests': |
| 210 return [ | 212 return [ |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 self.tool.CleanUpEnvironment() | 336 self.tool.CleanUpEnvironment() |
| 335 if self.test_package.cleanup_test_files: | 337 if self.test_package.cleanup_test_files: |
| 336 self.adb.RemovePushedFiles() | 338 self.adb.RemovePushedFiles() |
| 337 if self.dump_debug_info: | 339 if self.dump_debug_info: |
| 338 self.dump_debug_info.StopRecordingLog() | 340 self.dump_debug_info.StopRecordingLog() |
| 339 if self._performance_test_setup: | 341 if self._performance_test_setup: |
| 340 self._performance_test_setup.TearDown() | 342 self._performance_test_setup.TearDown() |
| 341 if self.dump_debug_info: | 343 if self.dump_debug_info: |
| 342 self.dump_debug_info.ArchiveNewCrashFiles() | 344 self.dump_debug_info.ArchiveNewCrashFiles() |
| 343 super(SingleTestRunner, self).TearDown() | 345 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |