| Index: build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| diff --git a/build/android/pylib/local/device/local_device_instrumentation_test_run.py b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| index 9f743353f992bf282a84cb739ef018c5f94af102..cae27b3b26462171a406d644e911ef9500bb2ca6 100644
|
| --- a/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| +++ b/build/android/pylib/local/device/local_device_instrumentation_test_run.py
|
| @@ -347,11 +347,10 @@ class LocalDeviceInstrumentationTestRun(
|
| if 'RetryOnFailure' in test.get('annotations', {}):
|
| return True
|
|
|
| - # TODO(jbudorick): Remove this log message and switch the return value to
|
| - # False after tests have been annotated with @RetryOnFailure.
|
| - # See crbug.com/619055 for more details.
|
| - logging.warning('Default retries are being phased out. crbug.com/619055')
|
| - return True
|
| + # TODO(jbudorick): Remove this log message once @RetryOnFailure has been
|
| + # enabled for a while. See crbug.com/619055 for more details.
|
| + logging.error('Default retries are being phased out. crbug.com/619055')
|
| + return False
|
|
|
| #override
|
| def _ShouldShard(self):
|
|
|