Add better exception handling for errors thrown by the websocket-clie… (

#155)

* Add better exception handling for errors thrown by the websocket-client library.

* Add test for handling websocket errors.

engineio/client.py

@@ -368,7 +368,7 @@ def _connect_websocket(self, url, headers, engineio_path):
                 ws = websocket.create_connection(
                     websocket_url + self._get_url_timestamp(), header=headers,
                     cookie=cookies)
-        except (ConnectionError, IOError):
+        except (ConnectionError, IOError, websocket.WebSocketException):
             if upgrade:
                 self.logger.warning(
                     'WebSocket upgrade failed: connection error')

tests/common/test_client.py

@@ -476,6 +476,18 @@ def test_websocket_connection_failed(self, create_connection, _time):
             'ws://foo/engine.io/?transport=websocket&EIO=3&t=123.456',
             header={'Foo': 'Bar'}, cookie=None)
 
+    @mock.patch('engineio.client.time.time', return_value=123.456)
+    @mock.patch('engineio.client.websocket.create_connection',
+                side_effect=[websocket.WebSocketException])
+    def test_websocket_connection_failed_with_websocket_error(
+            self, create_connection, _time):
+        c = client.Client()
+        self.assertRaises(exceptions.ConnectionError, c.connect, 'http://foo',
+                          transports=['websocket'], headers={'Foo': 'Bar'})
+        create_connection.assert_called_once_with(
+            'ws://foo/engine.io/?transport=websocket&EIO=3&t=123.456',
+            header={'Foo': 'Bar'}, cookie=None)
+
     @mock.patch('engineio.client.time.time', return_value=123.456)
     @mock.patch('engineio.client.websocket.create_connection',
                 side_effect=[ConnectionError])