Improve pyautolib errors.

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
 run pydoc on this file.
@@ skipping 66 matching lines @@
     print  >>sys.stderr, '*\n* Perhaps use "python2.5", not "python" ?\n*'
   raise
 
 # Should go after sys.path is set appropriately
 import bookmark_model
 import download_info
 import history_info
 import omnibox_info
 import plugins_info
 import prefs_info
+from pyauto_errors import AutomationCommandFail
 from pyauto_errors import JavascriptRuntimeError
 from pyauto_errors import JSONInterfaceError
 from pyauto_errors import NTPThumbnailNotShownError
 import pyauto_utils
 import simplejson as json  # found in third_party
 
 _CHROME_DRIVER_FACTORY = None
 _HTTP_SERVER = None
 _REMOTE_PROXY = None
 _OPTIONS = None
@@ skipping 999 matching lines @@
       cmd_dict_copy = copy.copy(cmd_dict)
       if 'password' in cmd_dict_copy.keys():
         cmd_dict_copy['password'] = '**********'
       if 'username' in cmd_dict_copy.keys():
         cmd_dict_copy['username'] = 'removed_username'
       raise JSONInterfaceError('Automation call %s received empty response.  '
                                'Additional information:\n%s' % (cmd_dict_copy,
                                additional_info))
     ret_dict = json.loads(result)
     if ret_dict.has_key('error'):
-      raise JSONInterfaceError(ret_dict['error'])
+      if ret_dict.get('is_interface_error'):
+        raise JSONInterfaceError(ret_dict['error'])
+      else:
+        raise AutomationCommandFail(ret_dict['error'])
     return ret_dict
 
   def NavigateToURL(self, url, windex=0, tab_index=None, navigation_count=1):
     """Navigate the given tab to the given URL.
 
     Note that this method also activates the corresponding tab/window if it's
     not active already. Blocks until |navigation_count| navigations have
     completed.
 
     Args:
@@ skipping 5861 matching lines @@
     successful = result.wasSuccessful()
     if not successful:
       pyauto_tests_file = os.path.join(self.TestsDir(), self._tests_filename)
       print >>sys.stderr, 'Tests can be disabled by editing %s. ' \
                           'Ref: %s' % (pyauto_tests_file, _PYAUTO_DOC_URL)
     sys.exit(not successful)
 
 
 if __name__ == '__main__':
   Main()