| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 'net/data/cache_tests', | 132 'net/data/cache_tests', |
| 133 'net/data/filter_unittests', | 133 'net/data/filter_unittests', |
| 134 'net/data/ftp', | 134 'net/data/ftp', |
| 135 'net/data/proxy_resolver_v8_tracing_unittest', | 135 'net/data/proxy_resolver_v8_tracing_unittest', |
| 136 'net/data/proxy_resolver_v8_unittest', | 136 'net/data/proxy_resolver_v8_unittest', |
| 137 'net/data/proxy_script_fetcher_unittest', | 137 'net/data/proxy_script_fetcher_unittest', |
| 138 'net/data/ssl/certificates', | 138 'net/data/ssl/certificates', |
| 139 'net/data/test.html', | 139 'net/data/test.html', |
| 140 'net/data/url_request_unittest/', | 140 'net/data/url_request_unittest/', |
| 141 ] | 141 ] |
| 142 elif test_suite_basename == 'ui_tests': | |
| 143 return [ | |
| 144 'chrome/test/data/dromaeo', | |
| 145 'chrome/test/data/json2.js', | |
| 146 'chrome/test/data/sunspider', | |
| 147 ] | |
| 148 elif test_suite_basename == 'ui_unittests': | 142 elif test_suite_basename == 'ui_unittests': |
| 149 return [ | 143 return [ |
| 150 'ui/base/test/data/data_pack_unittest/truncated-header.pak', | 144 'ui/base/test/data/data_pack_unittest/truncated-header.pak', |
| 151 ] | 145 ] |
| 152 elif test_suite_basename == 'content_unittests': | 146 elif test_suite_basename == 'content_unittests': |
| 153 return [ | 147 return [ |
| 154 'content/test/data/gpu/webgl_conformance_test_expectations.txt', | 148 'content/test/data/gpu/webgl_conformance_test_expectations.txt', |
| 155 'content/test/data/page_state/', | 149 'content/test/data/page_state/', |
| 156 'net/data/ssl/certificates/', | 150 'net/data/ssl/certificates/', |
| 157 'third_party/hyphen/hyph_en_US.dic', | 151 'third_party/hyphen/hyph_en_US.dic', |
| 158 'webkit/data/dom_storage/webcore_test_database.localstorage', | 152 'webkit/data/dom_storage/webcore_test_database.localstorage', |
| 159 ] | 153 ] |
| 160 elif test_suite_basename == 'cc_perftests': | 154 elif test_suite_basename == 'cc_perftests': |
| 161 return [ | 155 return [ |
| 162 'cc/test/data', | 156 'cc/test/data', |
| 163 ] | 157 ] |
| 164 elif test_suite_basename == 'perf_tests': | |
| 165 return [ | |
| 166 'base/test/data', | |
| 167 ] | |
| 168 elif test_suite_basename == 'content_browsertests': | 158 elif test_suite_basename == 'content_browsertests': |
| 169 return [ | 159 return [ |
| 170 'content/test/data/content-disposition-inline.html', | 160 'content/test/data/content-disposition-inline.html', |
| 171 'content/test/data/title1.html', | 161 'content/test/data/title1.html', |
| 172 'content/test/data/post_message2.html', | 162 'content/test/data/post_message2.html', |
| 173 'content/test/data/content-sniffer-test0.html.mock-http-headers', | 163 'content/test/data/content-sniffer-test0.html.mock-http-headers', |
| 174 'content/test/data/content-sniffer-test1.html.mock-http-headers', | 164 'content/test/data/content-sniffer-test1.html.mock-http-headers', |
| 175 'content/test/data/speech', | 165 'content/test/data/speech', |
| 176 'content/test/data/page404.html.mock-http-headers', | 166 'content/test/data/page404.html.mock-http-headers', |
| 177 'content/test/data/content-sniffer-test3.html', | 167 'content/test/data/content-sniffer-test3.html', |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 self.LaunchChromeTestServerSpawner() | 383 self.LaunchChromeTestServerSpawner() |
| 394 self.tool.SetupEnvironment() | 384 self.tool.SetupEnvironment() |
| 395 | 385 |
| 396 #override | 386 #override |
| 397 def TearDown(self): | 387 def TearDown(self): |
| 398 """Cleans up the test enviroment for the test suite.""" | 388 """Cleans up the test enviroment for the test suite.""" |
| 399 self.tool.CleanUpEnvironment() | 389 self.tool.CleanUpEnvironment() |
| 400 if self._cleanup_test_files: | 390 if self._cleanup_test_files: |
| 401 self.adb.RemovePushedFiles() | 391 self.adb.RemovePushedFiles() |
| 402 super(TestRunner, self).TearDown() | 392 super(TestRunner, self).TearDown() |
| OLD | NEW |