commit d5dde48725dae3292fac669a93d4ab53285a3262
author Tom Wai-Hong Tam <waihong@chromium.org> Fri Nov 21 05:11:23 2014 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Nov 21 02:38:49 2014 +0000
tree 257ac68b25afe149b4fc2faf23db2d42e0a7b8c9
parent 890cab3dfab750585076907f03a7442b7cb681a4

Remove the non-client dependency from the retry module

The client module retry depends on a non-client module, i.e. the proxy module
of frontend.afe.json_rpc. This dependency prevents any client-side code
from importing the retry module.

Searching for the entire code base of Autotest, this proxy thing is used
only by the frontend_wrappers. So moved it to the frontend_wrappers.

Also fixed its unit test.

BUG=chromium:434943
TEST=retry_unittest.py passed.

Change-Id: Id9963068ea328ce357df6521d186fd9fa6d0a72b
Reviewed-on: https://chromium-review.googlesource.com/231152
Tested-by: Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: Wai-Hong Tam <waihong@chromium.org>

client/common_lib/cros/retry.py

diff --git a/client/common_lib/cros/retry.py b/client/common_lib/cros/retry.py
index ae2e425..d8512de 100644
--- a/client/common_lib/cros/retry.py
+++ b/client/common_lib/cros/retry.py
@@ -5,7 +5,6 @@
 import logging, random, signal, sys, time
 
 from autotest_lib.client.common_lib import error
-from autotest_lib.frontend.afe.json_rpc import proxy
 
 
 def handler(signum, frame):
@@ -160,8 +159,7 @@
                         return result
                 except exception_tuple:
                     raise
-                except (error.CrosDynamicSuiteException,
-                        proxy.ValidationError):
+                except error.CrosDynamicSuiteException:
                     raise
                 except ExceptionToCheck as e:
                     logging.warning('%s(%s)', e.__class__, e)