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 import time | 10 import time |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 as_root=True) | 411 as_root=True) |
412 | 412 |
413 for s in self._servers[str(device)]: | 413 for s in self._servers[str(device)]: |
414 s.Reset() | 414 s.Reset() |
415 if self._test_instance.app_files: | 415 if self._test_instance.app_files: |
416 self._delegate.PullAppFiles(device, self._test_instance.app_files, | 416 self._delegate.PullAppFiles(device, self._test_instance.app_files, |
417 self._test_instance.app_file_dir) | 417 self._test_instance.app_file_dir) |
418 if not self._env.skip_clear_data: | 418 if not self._env.skip_clear_data: |
419 self._delegate.Clear(device) | 419 self._delegate.Clear(device) |
420 | 420 |
| 421 for l in output: |
| 422 logging.info(l) |
| 423 |
421 # Parse the output. | 424 # Parse the output. |
422 # TODO(jbudorick): Transition test scripts away from parsing stdout. | 425 # TODO(jbudorick): Transition test scripts away from parsing stdout. |
423 if self._test_instance.enable_xml_result_parsing: | 426 if self._test_instance.enable_xml_result_parsing: |
424 results = gtest_test_instance.ParseGTestXML(gtest_xml) | 427 results = gtest_test_instance.ParseGTestXML(gtest_xml) |
425 else: | 428 else: |
426 results = gtest_test_instance.ParseGTestOutput(output) | 429 results = gtest_test_instance.ParseGTestOutput(output) |
427 | 430 |
428 # Check whether there are any crashed testcases. | 431 # Check whether there are any crashed testcases. |
429 self._crashes.update(r.GetName() for r in results | 432 self._crashes.update(r.GetName() for r in results |
430 if r.GetType() == base_test_result.ResultType.CRASH) | 433 if r.GetType() == base_test_result.ResultType.CRASH) |
(...skipping 28 matching lines...) Expand all Loading... |
459 @local_device_environment.handle_shard_failures | 462 @local_device_environment.handle_shard_failures |
460 @trace_event.traced | 463 @trace_event.traced |
461 def individual_device_tear_down(dev): | 464 def individual_device_tear_down(dev): |
462 for s in self._servers.get(str(dev), []): | 465 for s in self._servers.get(str(dev), []): |
463 s.TearDown() | 466 s.TearDown() |
464 | 467 |
465 tool = self.GetTool(dev) | 468 tool = self.GetTool(dev) |
466 tool.CleanUpEnvironment() | 469 tool.CleanUpEnvironment() |
467 | 470 |
468 self._env.parallel_devices.pMap(individual_device_tear_down) | 471 self._env.parallel_devices.pMap(individual_device_tear_down) |
OLD | NEW |