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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 'content/test/data/nosniff-test.html.mock-http-headers', | 223 'content/test/data/nosniff-test.html.mock-http-headers', |
224 'content/test/data/accessibility', | 224 'content/test/data/accessibility', |
225 'content/test/data/dynamic1.html', | 225 'content/test/data/dynamic1.html', |
226 'content/test/data/browser_plugin_focus_child.html', | 226 'content/test/data/browser_plugin_focus_child.html', |
227 'content/test/data/rwhv_compositing_animation.html', | 227 'content/test/data/rwhv_compositing_animation.html', |
228 'content/test/data/click-noreferrer-links.html', | 228 'content/test/data/click-noreferrer-links.html', |
229 'content/test/data/browser_plugin_focus.html', | 229 'content/test/data/browser_plugin_focus.html', |
230 'content/test/data/media', | 230 'content/test/data/media', |
231 'third_party/webgl_conformance', | 231 'third_party/webgl_conformance', |
232 ] | 232 ] |
| 233 elif test_suite_basename == 'modules_unittests': |
| 234 return [ |
| 235 'resources', |
| 236 'data', |
| 237 ] |
233 return [] | 238 return [] |
234 | 239 |
235 | 240 |
236 def _TestSuiteRequiresMockTestServer(test_suite_basename): | 241 def _TestSuiteRequiresMockTestServer(test_suite_basename): |
237 """Returns True if the test suite requires mock test server.""" | 242 """Returns True if the test suite requires mock test server.""" |
238 tests_require_net_test_server = ['unit_tests', 'net_unittests', | 243 tests_require_net_test_server = ['unit_tests', 'net_unittests', |
239 'content_unittests', | 244 'content_unittests', |
240 'content_browsertests'] | 245 'content_browsertests'] |
241 return (test_suite_basename in | 246 return (test_suite_basename in |
242 tests_require_net_test_server) | 247 tests_require_net_test_server) |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 self.LaunchChromeTestServerSpawner() | 389 self.LaunchChromeTestServerSpawner() |
385 self.tool.SetupEnvironment() | 390 self.tool.SetupEnvironment() |
386 | 391 |
387 #override | 392 #override |
388 def TearDown(self): | 393 def TearDown(self): |
389 """Cleans up the test enviroment for the test suite.""" | 394 """Cleans up the test enviroment for the test suite.""" |
390 self.tool.CleanUpEnvironment() | 395 self.tool.CleanUpEnvironment() |
391 if self._cleanup_test_files: | 396 if self._cleanup_test_files: |
392 self.adb.RemovePushedFiles() | 397 self.adb.RemovePushedFiles() |
393 super(TestRunner, self).TearDown() | 398 super(TestRunner, self).TearDown() |
OLD | NEW |