| 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 pylib import android_commands | 10 from pylib import android_commands |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 return [ | 167 return [ |
| 168 'media/test/data', | 168 'media/test/data', |
| 169 ] | 169 ] |
| 170 elif self.test_package.test_suite_basename == 'net_unittests': | 170 elif self.test_package.test_suite_basename == 'net_unittests': |
| 171 return [ | 171 return [ |
| 172 'chrome/test/data/animate1.gif', | 172 'chrome/test/data/animate1.gif', |
| 173 'chrome/test/data/simple.html', | 173 'chrome/test/data/simple.html', |
| 174 'net/data/cache_tests', | 174 'net/data/cache_tests', |
| 175 'net/data/filter_unittests', | 175 'net/data/filter_unittests', |
| 176 'net/data/ftp', | 176 'net/data/ftp', |
| 177 'net/data/proxy_resolver_v8_tracing_unittest', |
| 177 'net/data/proxy_resolver_v8_unittest', | 178 'net/data/proxy_resolver_v8_unittest', |
| 178 'net/data/ssl/certificates', | 179 'net/data/ssl/certificates', |
| 179 'net/data/url_request_unittest/', | 180 'net/data/url_request_unittest/', |
| 180 'net/data/proxy_script_fetcher_unittest' | 181 'net/data/proxy_script_fetcher_unittest' |
| 181 ] | 182 ] |
| 182 elif self.test_package.test_suite_basename == 'ui_tests': | 183 elif self.test_package.test_suite_basename == 'ui_tests': |
| 183 return [ | 184 return [ |
| 184 'chrome/test/data/dromaeo', | 185 'chrome/test/data/dromaeo', |
| 185 'chrome/test/data/json2.js', | 186 'chrome/test/data/json2.js', |
| 186 'chrome/test/data/sunspider', | 187 'chrome/test/data/sunspider', |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 def TearDown(self): | 283 def TearDown(self): |
| 283 """Cleans up the test enviroment for the test suite.""" | 284 """Cleans up the test enviroment for the test suite.""" |
| 284 self.tool.CleanUpEnvironment() | 285 self.tool.CleanUpEnvironment() |
| 285 if self.test_package.cleanup_test_files: | 286 if self.test_package.cleanup_test_files: |
| 286 self.adb.RemovePushedFiles() | 287 self.adb.RemovePushedFiles() |
| 287 if self.dump_debug_info: | 288 if self.dump_debug_info: |
| 288 self.dump_debug_info.StopRecordingLog() | 289 self.dump_debug_info.StopRecordingLog() |
| 289 if self.dump_debug_info: | 290 if self.dump_debug_info: |
| 290 self.dump_debug_info.ArchiveNewCrashFiles() | 291 self.dump_debug_info.ArchiveNewCrashFiles() |
| 291 super(SingleTestRunner, self).TearDown() | 292 super(SingleTestRunner, self).TearDown() |
| OLD | NEW |