Improve pyautolib errors.

Adds a new pyauto exception for failures caught by automation calls (inherits from JSONInterfaceError).
Improves the error messages generated for automation infrastructure failures.

TEST=Manually caused automation commands to fail and verified error messages.
BUG=132803

Review URL: https://chromiumcodereview.appspot.com/10855161

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151853 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/functional/tracing/tab_tracker.py

@@ -60,7 +60,7 @@ class TabTracker(object):
       tab_uuid: the uuid of the tab to close
     """
     idx = self.GetTabIndex(tab_uuid)
-    self._browser.GetBrowserWindow(self._window_idx).GetTab(idx).Close()
+    self._browser.CloseTab(tab_index=idx, windex=self._window_idx)
     del self._uuids[idx]
 
   def GetTabIndex(self, tab_uuid):

chrome/test/functional/webrtc_brutality_test.py

@@ -74,4 +74,4 @@ class WebrtcBrutalityTest(webrtc_test_base.WebrtcTestBase):
 
 
 if __name__ == '__main__':
-  pyauto_functional.Main()
+  pyauto_functional.Main()
\ No newline at end of file

chrome/test/pyautolib/pyauto.py

@@ -84,6 +84,7 @@ 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
@@ -1103,7 +1104,10 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase):
                                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):

chrome/test/pyautolib/pyauto_errors.py

@@ -10,7 +10,15 @@ class JavascriptRuntimeError(RuntimeError):
 
 
 class JSONInterfaceError(RuntimeError):
-  """Represent an error in the JSON ipc interface."""
+  """Represent an error in the JSON IPC interface."""
+  pass
+
+
+class AutomationCommandFail(JSONInterfaceError):
+  """Represent an automation command failure.
+
+  These failures are passed back from the Chrome side of the IPC.
+  """
   pass
 
 

chrome/test/pyautolib/pyautolib.cc

@@ -104,20 +104,19 @@ AutomationProxy* PyUITestBase::automation() const {
   return automation_proxy;
 }
 
-scoped_refptr<BrowserProxy> PyUITestBase::GetBrowserWindow(int window_index) {
-  return automation()->GetBrowserWindow(window_index);
-}
-
 std::string PyUITestBase::_SendJSONRequest(int window_index,
                                            const std::string& request,
                                            int timeout) {
   std::string response;
   bool success;
-  AutomationMessageSender* automation_sender = automation();
+  AutomationProxy* automation_sender = automation();
   base::TimeTicks time = base::TimeTicks::Now();
 
   if (!automation_sender) {
-    ErrorResponse("The automation proxy does not exist", request, &response);
+    ErrorResponse("Automation proxy does not exist", request, &response);
+  } else if (!automation_sender->channel()) {
+    ErrorResponse("Chrome automation IPC channel was found already broken",
+                  request, &response);
   } else if (!automation_sender->Send(
       new AutomationMsg_SendJSONRequest(window_index, request, &response,
                                         &success),
@@ -138,6 +137,7 @@ void PyUITestBase::ErrorResponse(
                                        request.c_str());
   LOG(ERROR) << "Error during automation: " << error_msg;
   error_dict.SetString("error", error_msg);
+  error_dict.SetBoolean("is_interface_error", true);
   base::JSONWriter::Write(&error_dict, response);
 }
 
@@ -149,11 +149,13 @@ void PyUITestBase::RequestFailureResponse(
   // TODO(craigdh): Determine timeout directly from IPC's Send().
   if (duration >= timeout) {
     ErrorResponse(
-        StringPrintf("Request timed out after %d seconds",
+        StringPrintf("Chrome automation timed out after %d seconds",
                      static_cast<int>(duration.InSeconds())),
         request, response);
   } else {
     // TODO(craigdh): Determine specific cause.
-    ErrorResponse("Chrome failed to respond", request, response);
+    ErrorResponse(
+        "Chrome automation failed prior to timing out, did chrome crash?",
+        request, response);
   }
 }

chrome/test/pyautolib/pyautolib.h

@@ -71,9 +71,6 @@ class PyUITestBase : public UITestBase {
 
   // AutomationProxy methods
 
-  // Get a handle to browser window at the given index, or NULL on failure.
-  scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
-
   // Meta-methods.  Generic pattern of passing args and response as
   // JSON dict to avoid future use of the SWIG interface and
   // automation proxy additions.  Returns response as JSON dict.