| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 collections | 5 import collections |
| 6 import itertools | 6 import itertools |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import posixpath | 9 import posixpath |
| 10 | 10 |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 for s in self._servers[str(device)]: | 343 for s in self._servers[str(device)]: |
| 344 s.Reset() | 344 s.Reset() |
| 345 if self._test_instance.app_files: | 345 if self._test_instance.app_files: |
| 346 self._delegate.PullAppFiles(device, self._test_instance.app_files, | 346 self._delegate.PullAppFiles(device, self._test_instance.app_files, |
| 347 self._test_instance.app_file_dir) | 347 self._test_instance.app_file_dir) |
| 348 if not self._env.skip_clear_data: | 348 if not self._env.skip_clear_data: |
| 349 self._delegate.Clear(device) | 349 self._delegate.Clear(device) |
| 350 | 350 |
| 351 # Parse the output. | 351 # Parse the output. |
| 352 # TODO(jbudorick): Transition test scripts away from parsing stdout. | 352 # TODO(jbudorick): Transition test scripts away from parsing stdout. |
| 353 results = self._test_instance.ParseGTestOutput(output) | 353 results = gtest_test_instance.ParseGTestOutput(output) |
| 354 | 354 |
| 355 # Check whether there are any crashed testcases. | 355 # Check whether there are any crashed testcases. |
| 356 self._crashes.update(r.GetName() for r in results | 356 self._crashes.update(r.GetName() for r in results |
| 357 if r.GetType() == base_test_result.ResultType.CRASH) | 357 if r.GetType() == base_test_result.ResultType.CRASH) |
| 358 return results | 358 return results |
| 359 | 359 |
| 360 #override | 360 #override |
| 361 def TearDown(self): | 361 def TearDown(self): |
| 362 @local_device_test_run.handle_shard_failures | 362 @local_device_test_run.handle_shard_failures |
| 363 def individual_device_tear_down(dev): | 363 def individual_device_tear_down(dev): |
| 364 for s in self._servers.get(str(dev), []): | 364 for s in self._servers.get(str(dev), []): |
| 365 s.TearDown() | 365 s.TearDown() |
| 366 | 366 |
| 367 tool = self.GetTool(dev) | 367 tool = self.GetTool(dev) |
| 368 tool.CleanUpEnvironment() | 368 tool.CleanUpEnvironment() |
| 369 | 369 |
| 370 self._env.parallel_devices.pMap(individual_device_tear_down) | 370 self._env.parallel_devices.pMap(individual_device_tear_down) |
| OLD | NEW |