Merge branch 'master' into bug/RD-37835_ws_recv_hangs

# Conflicts:
#	browserdebuggertools/exceptions.py
#	browserdebuggertools/wssessionmanager.py
#	setup.py
#	tests/unittests/test_sockethandler.py

browserdebuggertools/exceptions.py

@@ -48,3 +48,7 @@ class UnknownError(ProtocolError):
 
 class MessagingThreadIsDeadError(DevToolsException):
     pass
+
+
+class InvalidParametersError(ProtocolError):
+    pass

browserdebuggertools/wssessionmanager.py

@@ -18,7 +18,8 @@
 from browserdebuggertools.exceptions import (
     DevToolsException, ResultNotFoundError, TabNotFoundError, MaxRetriesException,
     DevToolsTimeoutException, DomainNotEnabledError,
-    MethodNotFoundError, UnknownError, ResourceNotFoundError, MessagingThreadIsDeadError
+    MethodNotFoundError, UnknownError, ResourceNotFoundError, MessagingThreadIsDeadError,
+    InvalidParametersError
 )
 
 
@@ -329,6 +330,8 @@ def execute(self, domain_name, method_name, params=None):
                 raise ResourceNotFoundError(message)
             if code == -32601:
                 raise MethodNotFoundError(message)
+            if code == -32602:
+                raise InvalidParametersError(message)
             raise UnknownError("DevTools Protocol error code %s: %s" % (code, message))
         return result
 

tests/unittests/test_wssessionmanager.py

@@ -7,8 +7,8 @@
 
 from browserdebuggertools.exceptions import (
     DevToolsException, ResultNotFoundError, TabNotFoundError,
-    DomainNotEnabledError, DevToolsTimeoutException, MethodNotFoundError
-)
+    DomainNotEnabledError, DevToolsTimeoutException, MethodNotFoundError,
+    InvalidParametersError)
 from browserdebuggertools.wssessionmanager import WSSessionManager, _WSMessagingThread
 
 MODULE_PATH = "browserdebuggertools.wssessionmanager."
@@ -275,6 +275,16 @@ def test(self):
             "method": "%s.%s" % (domain, method), "params": {}
         })
 
+    @patch(MODULE_PATH + "WSSessionManager._execute", new=MagicMock())
+    def test_error(self):
+
+        self.session_manager._wait_for_result = MagicMock(
+            return_value={"error": {"code": -32602, "message": "Invalid interceptionId"}}
+        )
+
+        with self.assertRaises(InvalidParametersError):
+            self.session_manager.execute(MagicMock(), MagicMock(), None)
+
 
 class Test_WSSessionManager_add_domain(SessionManagerTest):