| 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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 include_stack_symbols=False, | 433 include_stack_symbols=False, |
| 434 wipe_tombstones=True) | 434 wipe_tombstones=True) |
| 435 stream_name = 'tombstones_%s_%s' % ( | 435 stream_name = 'tombstones_%s_%s' % ( |
| 436 time.strftime('%Y%m%dT%H%M%S', time.localtime()), | 436 time.strftime('%Y%m%dT%H%M%S', time.localtime()), |
| 437 device.serial) | 437 device.serial) |
| 438 tombstones_url = tombstones.LogdogTombstones(resolved_tombstones, | 438 tombstones_url = tombstones.LogdogTombstones(resolved_tombstones, |
| 439 stream_name) | 439 stream_name) |
| 440 result.SetTombstonesUrl(tombstones_url) | 440 result.SetTombstonesUrl(tombstones_url) |
| 441 | 441 |
| 442 not_run_tests = set(test).difference(set(r.GetName() for r in results)) | 442 not_run_tests = set(test).difference(set(r.GetName() for r in results)) |
| 443 return results, list(not_run_tests) | 443 return results, list(not_run_tests) if results else None |
| 444 | 444 |
| 445 #override | 445 #override |
| 446 def TearDown(self): | 446 def TearDown(self): |
| 447 @local_device_environment.handle_shard_failures | 447 @local_device_environment.handle_shard_failures |
| 448 def individual_device_tear_down(dev): | 448 def individual_device_tear_down(dev): |
| 449 for s in self._servers.get(str(dev), []): | 449 for s in self._servers.get(str(dev), []): |
| 450 s.TearDown() | 450 s.TearDown() |
| 451 | 451 |
| 452 tool = self.GetTool(dev) | 452 tool = self.GetTool(dev) |
| 453 tool.CleanUpEnvironment() | 453 tool.CleanUpEnvironment() |
| 454 | 454 |
| 455 self._env.parallel_devices.pMap(individual_device_tear_down) | 455 self._env.parallel_devices.pMap(individual_device_tear_down) |
| OLD | NEW |