[Android] Log once per minute while waiting for timeout_retry thread completion.

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 itertools
 import sys
 import threading
 
 from devil.android import device_errors
 from devil.utils import cmd_helper
 from devil.utils import reraiser_thread
 from devil.utils import timeout_retry
 
 DEFAULT_TIMEOUT_ATTR = '_default_timeout'
 DEFAULT_RETRIES_ATTR = '_default_retries'
 
 
 def _TimeoutRetryWrapper(f, timeout_func, retries_func, pass_values=False):
   """ Wraps a funcion with timeout and retry handling logic.
 
   Args:
     f: The function to wrap.
     timeout_func: A callable that returns the timeout value.
     retries_func: A callable that returns the retries value.
     pass_values: If True, passes the values returned by |timeout_func| and
                  |retries_func| to the wrapped function as 'timeout' and
                  'retries' kwargs, respectively.
   Returns:
     The wrapped function.
   """
   @functools.wraps(f)
-  def TimeoutRetryWrapper(*args, **kwargs):
+  def timeout_retry_wrapper(*args, **kwargs):
     timeout = timeout_func(*args, **kwargs)
     retries = retries_func(*args, **kwargs)
     if pass_values:
       kwargs['timeout'] = timeout
       kwargs['retries'] = retries
+    @functools.wraps(f)
     def impl():
       return f(*args, **kwargs)
     try:
       if isinstance(threading.current_thread(),
                     timeout_retry.TimeoutRetryThread):
         return impl()
       else:
-        return timeout_retry.Run(impl, timeout, retries)
+        desc = '%s(%s)' % (f.__name__, ', '.join(itertools.chain(
+            (str(a) for a in args),
+            ('%s=%s' % (k, str(v)) for k, v in kwargs.iteritems()))))
+        return timeout_retry.Run(impl, timeout, retries, desc=desc)
     except reraiser_thread.TimeoutError as e:
       raise device_errors.CommandTimeoutError(str(e)), None, (
           sys.exc_info()[2])
     except cmd_helper.TimeoutError as e:
       raise device_errors.CommandTimeoutError(str(e)), None, (
           sys.exc_info()[2])
-  return TimeoutRetryWrapper
+  return timeout_retry_wrapper
 
 
 def WithTimeoutAndRetries(f):
   """A decorator that handles timeouts and retries.
 
   'timeout' and 'retries' kwargs must be passed to the function.
 
   Args:
     f: The function to decorate.
   Returns:
@@ skipping 72 matching lines @@
     def get_timeout(inst, *_args, **kwargs):
       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