commit f8b5306840870a8ebec3a5dc4b77c0bd79a69c5b
author Chris Masone <cmasone@chromium.org> Tue May 08 22:14:18 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed May 09 21:38:59 2012 -0700
tree 269e7dc95a11cbbb94b07a79b48fe425622d1726
parent e0b3be1fe671b26e54c84089155b2d0ebbb77d4f

[autotest] Make json_rpc raise meaningful exceptions

Add some dynamic suite exceptions to client/common_lib/error.py so
that different parts of the system can all reference them.  Then,
enable the json_rpc code to detect these exceptions coming back
over the wire, re-instantiate them on the client side, and raise
them.

BUG=chromium-os:30279
TEST=unit
TEST=use atest suite create to try to create a suite for a build that doesn't exist
TEST=use atest suite create to try to run a suite that doesn't exist

Change-Id: I1b6d56a7e1bdb63cc893a07581efc8decc0407f4
Reviewed-on: https://gerrit.chromium.org/gerrit/22250
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Ready: Chris Masone <cmasone@chromium.org>

server/cros/control_file_getter.py

diff --git a/server/cros/control_file_getter.py b/server/cros/control_file_getter.py
index 796e566..2f83538 100644
--- a/server/cros/control_file_getter.py
+++ b/server/cros/control_file_getter.py
@@ -8,14 +8,7 @@
 from autotest_lib.client.common_lib.cros import dev_server
 
 
-class ControlFileNotFound(Exception):
-    """Raised when a control file cannot be found and/or read."""
-    pass
-
-
-class NoControlFileList(Exception):
-    """Raised when to indicate that a listing can't be done."""
-    pass
+# Relevant CrosDynamicSuiteExceptions are defined in client/common_lib/error.py.
 
 
 class ControlFileGetter(object):
@@ -93,7 +86,7 @@
         @throws ControlFileNotFound if the file cannot be retrieved.
         """
         if not self._files and not self.get_control_file_list():
-            raise ControlFileNotFound('No control files found.')
+            raise error.ControlFileNotFound('No control files found.')
 
         if 'control' not in test_name:
             regexp = re.compile(os.path.join(test_name, 'control'))
@@ -101,9 +94,9 @@
             regexp = re.compile(test_name)
         candidates = filter(regexp.search, self._files)
         if not candidates:
-            raise ControlFileNotFound('No control file for ' + test_name)
+            raise error.ControlFileNotFound('No control file for ' + test_name)
         if len(candidates) > 1:
-            raise ControlFileNotFound(test_name + ' is not unique.')
+            raise error.ControlFileNotFound(test_name + ' is not unique.')
         return self.get_control_file_contents(candidates[0])
 
 
@@ -155,7 +148,7 @@
                     directories.append(fullpath)
         if not self._files:
             msg = 'No control files under ' + ','.join(self._paths)
-            raise NoControlFileList(msg)
+            raise error.NoControlFileList(msg)
         return [f for f in self._files if self._is_useful_file(f)]
 
 
@@ -172,7 +165,7 @@
             msg = "Can't retrieve {0}: {1} ({2})".format(test_path,
                                                          strerror,
                                                          errno)
-            raise ControlFileNotFound(msg)
+            raise error.ControlFileNotFound(msg)
 
 
 class DevServerGetter(CacheingControlFileGetter):
@@ -206,7 +199,7 @@
         try:
             return self._dev_server.list_control_files(self._build)
         except urllib2.HTTPError as e:
-            raise NoControlFileList(e)
+            raise error.NoControlFileList(e)
 
 
     def get_control_file_contents(self, test_path):
@@ -222,4 +215,4 @@
         try:
             return self._dev_server.get_control_file(self._build, test_path)
         except urllib2.HTTPError as e:
-            raise ControlFileNotFound(e)
+            raise error.ControlFileNotFound(e)