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 """Class for running instrumentation tests on a single device.""" | 5 """Class for running instrumentation tests on a single device.""" |
6 | 6 |
7 import logging | 7 import logging |
8 import os | 8 import os |
9 import re | 9 import re |
10 import shutil | 10 import shutil |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 else: | 146 else: |
147 if self.adb.SetJavaAssertsEnabled(enable=not self.disable_assertions): | 147 if self.adb.SetJavaAssertsEnabled(enable=not self.disable_assertions): |
148 self.adb.Reboot(full_reboot=False) | 148 self.adb.Reboot(full_reboot=False) |
149 | 149 |
150 # We give different default value to launch HTTP server based on shard index | 150 # We give different default value to launch HTTP server based on shard index |
151 # because it may have race condition when multiple processes are trying to | 151 # because it may have race condition when multiple processes are trying to |
152 # launch lighttpd with same port at same time. | 152 # launch lighttpd with same port at same time. |
153 http_server_ports = self.LaunchTestHttpServer( | 153 http_server_ports = self.LaunchTestHttpServer( |
154 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) | 154 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) |
155 if self.ports_to_forward: | 155 if self.ports_to_forward: |
156 self.ForwardPorts([(port, port) for port in self.ports_to_forward]) | 156 self.StartForwarder([(port, port) for port in self.ports_to_forward]) |
157 self.flags.AddFlags(['--enable-test-intents']) | 157 self.flags.AddFlags(['--enable-test-intents']) |
158 | 158 |
159 def TearDown(self): | 159 def TearDown(self): |
160 """Cleans up the test harness and saves outstanding data from test run.""" | 160 """Cleans up the test harness and saves outstanding data from test run.""" |
161 if self.ports_to_forward: | |
162 self._UnmapPortPairs(self.ports_to_forward) | |
163 super(TestRunner, self).TearDown() | 161 super(TestRunner, self).TearDown() |
164 | 162 |
165 def TestSetup(self, test): | 163 def TestSetup(self, test): |
166 """Sets up the test harness for running a particular test. | 164 """Sets up the test harness for running a particular test. |
167 | 165 |
168 Args: | 166 Args: |
169 test: The name of the test that will be run. | 167 test: The name of the test that will be run. |
170 """ | 168 """ |
171 self.SetupPerfMonitoringIfNeeded(test) | 169 self.SetupPerfMonitoringIfNeeded(test) |
172 self._SetupIndividualTestTimeoutScale(test) | 170 self._SetupIndividualTestTimeoutScale(test) |
173 self.tool.SetupEnvironment() | 171 self.tool.SetupEnvironment() |
174 | 172 |
| 173 # Make sure the forwarder is still running. |
| 174 self.RestartHttpServerForwarderIfNecessary() |
| 175 |
175 def _IsPerfTest(self, test): | 176 def _IsPerfTest(self, test): |
176 """Determines whether a test is a performance test. | 177 """Determines whether a test is a performance test. |
177 | 178 |
178 Args: | 179 Args: |
179 test: The name of the test to be checked. | 180 test: The name of the test to be checked. |
180 | 181 |
181 Returns: | 182 Returns: |
182 Whether the test is annotated as a performance test. | 183 Whether the test is annotated as a performance test. |
183 """ | 184 """ |
184 return _PERF_TEST_ANNOTATION in self.test_pkg.GetTestAnnotations(test) | 185 return _PERF_TEST_ANNOTATION in self.test_pkg.GetTestAnnotations(test) |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
350 duration_ms = 0 | 351 duration_ms = 0 |
351 message = str(e) | 352 message = str(e) |
352 if not message: | 353 if not message: |
353 message = 'No information.' | 354 message = 'No information.' |
354 results.AddResult(test_result.InstrumentationTestResult( | 355 results.AddResult(test_result.InstrumentationTestResult( |
355 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, | 356 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, |
356 log=message)) | 357 log=message)) |
357 raw_result = None | 358 raw_result = None |
358 self.TestTeardown(test, raw_result) | 359 self.TestTeardown(test, raw_result) |
359 return (results, None if results.DidRunPass() else test) | 360 return (results, None if results.DidRunPass() else test) |
OLD | NEW |