DeviceUtils: Make Install and PushChangedFiles respect instance retries / timeout

build/android/devil/android/decorators.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Function/method decorators that provide timeout and retry logic.
 """
 
 import functools
 import sys
@@ skipping 98 matching lines @@
   """
   def decorator(f):
     get_timeout = lambda *a, **kw: kw.get('timeout', default_timeout)
     get_retries = lambda *a, **kw: kw.get('retries', default_retries)
     return _TimeoutRetryWrapper(f, get_timeout, get_retries, pass_values=True)
   return decorator
 
 
 def WithTimeoutAndRetriesFromInstance(
     default_timeout_name=DEFAULT_TIMEOUT_ATTR,
-    default_retries_name=DEFAULT_RETRIES_ATTR):
+    default_retries_name=DEFAULT_RETRIES_ATTR,
+    min_default_timeout=None):
   """Returns a decorator that handles timeouts and retries.
 
   The provided |default_timeout_name| and |default_retries_name| are used to
   get the default timeout value and the default retries value from the object
   instance if timeout and retries values are not provided.
 
   Note that this should only be used to decorate methods, not functions.
 
   Args:
     default_timeout_name: The name of the default timeout attribute of the
                           instance.
     default_retries_name: The name of the default retries attribute of the
                           instance.
+    min_timeout: Miniumum timeout to be used when using instance timeout.
   Returns:
     The actual decorator.
   """
   def decorator(f):
     def get_timeout(inst, *_args, **kwargs):
-      return kwargs.get('timeout', getattr(inst, default_timeout_name))
+      ret = getattr(inst, default_timeout_name)
+      if min_default_timeout is not None:
+        ret = max(min_default_timeout, ret)
+      return kwargs.get('timeout', ret)
     def get_retries(inst, *_args, **kwargs):
       return kwargs.get('retries', getattr(inst, default_retries_name))
     return _TimeoutRetryWrapper(f, get_timeout, get_retries, pass_values=True)
   return decorator