Allow custom client subclasses to be used in SimpleClient and AsyncSimpleClient (Fixes #1432)

src/socketio/async_simple_client.py

@@ -12,6 +12,8 @@ class AsyncSimpleClient:
     The positional and keyword arguments given in the constructor are passed
     to the underlying :func:`socketio.AsyncClient` object.
     """
+    client_class = AsyncClient
+
     def __init__(self, *args, **kwargs):
         self.client_args = args
         self.client_kwargs = kwargs
@@ -60,7 +62,8 @@ class AsyncSimpleClient:
         self.namespace = namespace
         self.input_buffer = []
         self.input_event.clear()
-        self.client = AsyncClient(*self.client_args, **self.client_kwargs)
+        self.client = self.client_class(
+            *self.client_args, **self.client_kwargs)
 
         @self.client.event(namespace=self.namespace)
         def connect():  # pragma: no cover

src/socketio/simple_client.py

@@ -12,6 +12,8 @@ class SimpleClient:
     The positional and keyword arguments given in the constructor are passed
     to the underlying :func:`socketio.Client` object.
     """
+    client_class = Client
+
     def __init__(self, *args, **kwargs):
         self.client_args = args
         self.client_kwargs = kwargs
@@ -58,7 +60,8 @@ class SimpleClient:
         self.namespace = namespace
         self.input_buffer = []
         self.input_event.clear()
-        self.client = Client(*self.client_args, **self.client_kwargs)
+        self.client = self.client_class(
+            *self.client_args, **self.client_kwargs)
 
         @self.client.event(namespace=self.namespace)
         def connect():  # pragma: no cover

tests/async/test_simple_client.py

@@ -16,9 +16,11 @@ class TestAsyncAsyncSimpleClient:
         assert not client.connected
 
     async def test_connect(self):
+        mock_client = mock.MagicMock()
+        original_client_class = AsyncSimpleClient.client_class
+        AsyncSimpleClient.client_class = mock_client
+
         client = AsyncSimpleClient(123, a='b')
-        with mock.patch('socketio.async_simple_client.AsyncClient') \
-                as mock_client:
         mock_client.return_value.connect = mock.AsyncMock()
 
         await client.connect('url', headers='h', auth='a', transports='t',
@@ -34,11 +36,14 @@ class TestAsyncAsyncSimpleClient:
         assert client.namespace == 'n'
         assert not client.input_event.is_set()
 
+        AsyncSimpleClient.client_class = original_client_class
+
     async def test_connect_context_manager(self):
-        async def _t():
+        mock_client = mock.MagicMock()
+        original_client_class = AsyncSimpleClient.client_class
+        AsyncSimpleClient.client_class = mock_client
+
         async with AsyncSimpleClient(123, a='b') as client:
-                with mock.patch('socketio.async_simple_client.AsyncClient') \
-                        as mock_client:
             mock_client.return_value.connect = mock.AsyncMock()
 
             await client.connect('url', headers='h', auth='a',
@@ -55,7 +60,7 @@ class TestAsyncAsyncSimpleClient:
             assert client.namespace == 'n'
             assert not client.input_event.is_set()
 
-        await _t()
+        AsyncSimpleClient.client_class = original_client_class
 
     async def test_connect_twice(self):
         client = AsyncSimpleClient(123, a='b')

tests/common/test_simple_client.py

@@ -14,8 +14,11 @@ class TestSimpleClient:
         assert not client.connected
 
     def test_connect(self):
+        mock_client = mock.MagicMock()
+        original_client_class = SimpleClient.client_class
+        SimpleClient.client_class = mock_client
+
         client = SimpleClient(123, a='b')
-        with mock.patch('socketio.simple_client.Client') as mock_client:
         client.connect('url', headers='h', auth='a', transports='t',
                        namespace='n', socketio_path='s', wait_timeout='w')
         mock_client.assert_called_once_with(123, a='b')
@@ -28,9 +31,14 @@ class TestSimpleClient:
         assert client.namespace == 'n'
         assert not client.input_event.is_set()
 
+        SimpleClient.client_class = original_client_class
+
     def test_connect_context_manager(self):
+        mock_client = mock.MagicMock()
+        original_client_class = SimpleClient.client_class
+        SimpleClient.client_class = mock_client
+
         with SimpleClient(123, a='b') as client:
-            with mock.patch('socketio.simple_client.Client') as mock_client:
             client.connect('url', headers='h', auth='a', transports='t',
                            namespace='n', socketio_path='s',
                            wait_timeout='w')
@@ -44,6 +52,8 @@ class TestSimpleClient:
             assert client.namespace == 'n'
             assert not client.input_event.is_set()
 
+        SimpleClient.client_class = original_client_class
+
     def test_connect_twice(self):
         client = SimpleClient(123, a='b')
         client.client = mock.MagicMock()