| OLD | NEW |
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 posixpath | 7 import posixpath |
| 8 import re | 8 import re |
| 9 import time | 9 import time |
| 10 | 10 |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 328 resolved_tombstones = None | 328 resolved_tombstones = None |
| 329 for result in results: | 329 for result in results: |
| 330 if result.GetType() == base_test_result.ResultType.CRASH: | 330 if result.GetType() == base_test_result.ResultType.CRASH: |
| 331 if not resolved_tombstones: | 331 if not resolved_tombstones: |
| 332 resolved_tombstones = '\n'.join(tombstones.ResolveTombstones( | 332 resolved_tombstones = '\n'.join(tombstones.ResolveTombstones( |
| 333 device, | 333 device, |
| 334 resolve_all_tombstones=True, | 334 resolve_all_tombstones=True, |
| 335 include_stack_symbols=False, | 335 include_stack_symbols=False, |
| 336 wipe_tombstones=True)) | 336 wipe_tombstones=True)) |
| 337 result.SetTombstones(resolved_tombstones) | 337 result.SetTombstones(resolved_tombstones) |
| 338 return results | 338 return results, None |
| 339 | 339 |
| 340 #override | 340 #override |
| 341 def _ShouldRetry(self, test): | 341 def _ShouldRetry(self, test): |
| 342 if 'RetryOnFailure' in test.get('annotations', {}): | 342 if 'RetryOnFailure' in test.get('annotations', {}): |
| 343 return True | 343 return True |
| 344 | 344 |
| 345 # TODO(jbudorick): Remove this log message once @RetryOnFailure has been | 345 # TODO(jbudorick): Remove this log message once @RetryOnFailure has been |
| 346 # enabled for a while. See crbug.com/619055 for more details. | 346 # enabled for a while. See crbug.com/619055 for more details. |
| 347 logging.error('Default retries are being phased out. crbug.com/619055') | 347 logging.error('Default retries are being phased out. crbug.com/619055') |
| 348 return False | 348 return False |
| (...skipping 17 matching lines...) Expand all Loading... |
| 366 timeout = v | 366 timeout = v |
| 367 break | 367 break |
| 368 else: | 368 else: |
| 369 logging.warning('Using default 1 minute timeout for %s', test_name) | 369 logging.warning('Using default 1 minute timeout for %s', test_name) |
| 370 timeout = 60 | 370 timeout = 60 |
| 371 | 371 |
| 372 timeout *= cls._GetTimeoutScaleFromAnnotations(annotations) | 372 timeout *= cls._GetTimeoutScaleFromAnnotations(annotations) |
| 373 | 373 |
| 374 return timeout | 374 return timeout |
| 375 | 375 |
| OLD | NEW |