Invoke the disconnect handler when the client initiates a disconnection (Fixes miguelgrinberg#594)

miguelgrinberg · miguelgrinberg · commit 3349b024d59a · 2020-12-26T00:17:47.000Z
diff --git a/socketio/asyncio_client.py b/socketio/asyncio_client.py
@@ -255,7 +255,6 @@ async def disconnect(self):
         for n in self.namespaces:
             await self._send_packet(packet.Packet(packet.DISCONNECT,
                                     namespace=n))
-        self.connected = False
         await self.eio.disconnect(abort=True)
 
     def start_background_task(self, target, *args, **kwargs):
diff --git a/socketio/client.py b/socketio/client.py
@@ -408,7 +408,6 @@ def disconnect(self):
         # later in _handle_eio_disconnect we invoke the disconnect handler
         for n in self.namespaces:
             self._send_packet(packet.Packet(packet.DISCONNECT, namespace=n))
-        self.connected = False
         self.eio.disconnect(abort=True)
 
     def get_sid(self, namespace=None):
diff --git a/tests/asyncio/test_asyncio_client.py b/tests/asyncio/test_asyncio_client.py
@@ -406,13 +406,15 @@ async def fake_event_wait():
 
     def test_disconnect(self):
         c = asyncio_client.AsyncClient()
+        c.connected = True
         c.namespaces = {'/': '1'}
         c._trigger_event = AsyncMock()
         c._send_packet = AsyncMock()
         c.eio = mock.MagicMock()
         c.eio.disconnect = AsyncMock()
         c.eio.state = 'connected'
         _run(c.disconnect())
+        assert c.connected
         assert c._trigger_event.mock.call_count == 0
         assert c._send_packet.mock.call_count == 1
         expected_packet = packet.Packet(packet.DISCONNECT, namespace='/')
diff --git a/tests/common/test_client.py b/tests/common/test_client.py
@@ -508,12 +508,14 @@ def fake_event_wait(timeout=None):
 
     def test_disconnect(self):
         c = client.Client()
+        c.connected = True
         c.namespaces = {'/': '1'}
         c._trigger_event = mock.MagicMock()
         c._send_packet = mock.MagicMock()
         c.eio = mock.MagicMock()
         c.eio.state = 'connected'
         c.disconnect()
+        assert c.connected
         assert c._trigger_event.call_count == 0
         assert c._send_packet.call_count == 1
         expected_packet = packet.Packet(packet.DISCONNECT, namespace='/')
