Fix: SimpleClient.call does not raise TimeoutError on timeout (#1501)

Author: jthistle

src/socketio/async_simple_client.py

@@ -163,6 +163,8 @@ async def call(self, event, data=None, timeout=60):
                 return await self.client.call(event, data,
                                               namespace=self.namespace,
                                               timeout=timeout)
+            except TimeoutError:
+                raise
             except SocketIOError:
                 pass
 

src/socketio/simple_client.py

@@ -155,6 +155,8 @@ def call(self, event, data=None, timeout=60):
             try:
                 return self.client.call(event, data, namespace=self.namespace,
                                         timeout=timeout)
+            except TimeoutError:
+                raise
             except SocketIOError:
                 pass
 

tests/async/test_simple_client.py

@@ -142,6 +142,17 @@ async def test_call_retries(self):
         client.client.call.assert_awaited_with('foo', 'bar', namespace='/',
                                                timeout=60)
 
+    async def test_call_timeout(self):
+        client = AsyncSimpleClient()
+        client.connected_event.set()
+        client.connected = True
+        client.client = mock.MagicMock()
+        client.client.call = mock.AsyncMock()
+        client.client.call.side_effect = TimeoutError()
+
+        with pytest.raises(TimeoutError):
+            await client.call('foo', 'bar')
+
     async def test_receive_with_input_buffer(self):
         client = AsyncSimpleClient()
         client.input_buffer = ['foo', 'bar']

tests/common/test_simple_client.py

@@ -130,6 +130,16 @@ def test_call_retries(self):
         client.client.call.assert_called_with('foo', 'bar', namespace='/',
                                               timeout=60)
 
+    def test_call_timeout(self):
+        client = SimpleClient()
+        client.connected_event.set()
+        client.connected = True
+        client.client = mock.MagicMock()
+        client.client.call.side_effect = TimeoutError()
+
+        with pytest.raises(TimeoutError):
+            client.call('foo', 'bar')
+
     def test_receive_with_input_buffer(self):
         client = SimpleClient()
         client.input_buffer = ['foo', 'bar']