| 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 logging | 5 import logging |
| 6 import os | 6 import os |
| 7 import re | 7 import re |
| 8 | 8 |
| 9 from pylib import pexpect | 9 from pylib import pexpect |
| 10 from pylib import ports | 10 from pylib import ports |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 RE_PASSED = re.compile('\\[ PASSED \\] ?(.*)\r\n') | 23 RE_PASSED = re.compile('\\[ PASSED \\] ?(.*)\r\n') |
| 24 RE_RUNNER_FAIL = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n') | 24 RE_RUNNER_FAIL = re.compile('\\[ RUNNER_FAILED \\] ?(.*)\r\n') |
| 25 # Signal handlers are installed before starting tests | 25 # Signal handlers are installed before starting tests |
| 26 # to output the CRASHED marker when a crash happens. | 26 # to output the CRASHED marker when a crash happens. |
| 27 RE_CRASH = re.compile('\\[ CRASHED \\](.*)\r\n') | 27 RE_CRASH = re.compile('\\[ CRASHED \\](.*)\r\n') |
| 28 | 28 |
| 29 | 29 |
| 30 def _TestSuiteRequiresMockTestServer(suite_name): | 30 def _TestSuiteRequiresMockTestServer(suite_name): |
| 31 """Returns True if the test suite requires mock test server.""" | 31 """Returns True if the test suite requires mock test server.""" |
| 32 tests_require_net_test_server = ['unit_tests', 'net_unittests', | 32 tests_require_net_test_server = ['unit_tests', 'net_unittests', |
| 33 'components_browsertests', |
| 33 'content_unittests', | 34 'content_unittests', |
| 34 'content_browsertests'] | 35 'content_browsertests'] |
| 35 return (suite_name in | 36 return (suite_name in |
| 36 tests_require_net_test_server) | 37 tests_require_net_test_server) |
| 37 | 38 |
| 38 def _TestSuiteRequiresHighPerfMode(suite_name): | 39 def _TestSuiteRequiresHighPerfMode(suite_name): |
| 39 """Returns True if the test suite requires high performance mode.""" | 40 """Returns True if the test suite requires high performance mode.""" |
| 40 return 'perftests' in suite_name | 41 return 'perftests' in suite_name |
| 41 | 42 |
| 42 class TestRunner(base_test_runner.BaseTestRunner): | 43 class TestRunner(base_test_runner.BaseTestRunner): |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 #override | 187 #override |
| 187 def TearDown(self): | 188 def TearDown(self): |
| 188 """Cleans up the test enviroment for the test suite.""" | 189 """Cleans up the test enviroment for the test suite.""" |
| 189 for s in self._servers: | 190 for s in self._servers: |
| 190 s.TearDown() | 191 s.TearDown() |
| 191 if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name): | 192 if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name): |
| 192 self._perf_controller.SetDefaultPerfMode() | 193 self._perf_controller.SetDefaultPerfMode() |
| 193 self.test_package.ClearApplicationState(self.device) | 194 self.test_package.ClearApplicationState(self.device) |
| 194 self.tool.CleanUpEnvironment() | 195 self.tool.CleanUpEnvironment() |
| 195 super(TestRunner, self).TearDown() | 196 super(TestRunner, self).TearDown() |
| OLD | NEW |