Make timeout_retry include the total timeout in the exception error

devil/devil/utils/timeout_retry.py

Index: devil/devil/utils/timeout_retry.py
diff --git a/devil/devil/utils/timeout_retry.py b/devil/devil/utils/timeout_retry.py
index d2304629e9c00a66b114191e2bc5cbb34f52b94a..d01485184da550ddca52758526795a6fbec02edf 100644
--- a/devil/devil/utils/timeout_retry.py
+++ b/devil/devil/utils/timeout_retry.py
@@ -49,7 +49,7 @@ class TimeoutRetryThreadGroup(reraiser_thread.ReraiserThreadGroup):
     remaining = self._watcher.GetRemaining()
     if remaining is not None and remaining < required:
       if msg is None:
-        msg = 'Timeout expired'
+        msg = 'Timeout of %.1f secs expired' % self._watcher.GetTimeout()
       if remaining > 0:
         msg += (', wait of %.1f secs required but only %.1f secs left'
                 % (required, remaining))

[perezju, 2017/08/16 08:35:29]

As I just wrote on the tracking issue; maybe it's fine to remove this extra
detail?

[charliea (OOO until 10-5), 2017/08/18 18:52:18]

Done.