fix: always stop the event loop when disconnecting

Author: allenporter

roborock/cloud_api.py

@@ -74,11 +74,6 @@ def __init__(self, user_data: UserData, device_info: DeviceData, queue_timeout:
         self._waiting_queue: dict[int, RoborockFuture] = {}
         self._mutex = Lock()
 
-    async def async_release(self) -> None:
-        """Release the MQTT client."""
-        await super().async_release()
-        await self.event_loop.run_in_executor(None, self._mqtt_client.loop_stop)
-
     def _mqtt_on_connect(self, *args, **kwargs):
         _, __, ___, rc, ____ = args
         connection_queue = self._waiting_queue.get(CONNECT_REQUEST_ID)
@@ -161,10 +156,9 @@ def sync_connect(self) -> Any:
     async def async_disconnect(self) -> None:
         async with self._mutex:
             if disconnected_future := self.sync_disconnect():
-                try:
-                    await disconnected_future
-                except VacuumError as err:
-                    raise RoborockException(err) from err
+                # There are no errors set on this future
+                await disconnected_future
+            await self.event_loop.run_in_executor(None, self._mqtt_client.loop_stop)
 
     async def async_connect(self) -> None:
         async with self._mutex:

tests/test_api.py

@@ -1,5 +1,6 @@
 import asyncio
 import json
+import logging
 from collections.abc import AsyncGenerator
 from queue import Queue
 from typing import Any
@@ -168,7 +169,7 @@ async def test_async_connect(received_requests: Queue, connected_mqtt_client: Ro
     assert received_requests.qsize() >= 2  # Connect and Subscribe
 
 
-async def test_connect_failure(
+async def test_connect_failure_response(
     received_requests: Queue, response_queue: Queue, mqtt_client: RoborockMqttClientV1
 ) -> None:
     """Test the broker responding with a connect failure."""
@@ -203,6 +204,24 @@ async def test_disconnect_failure(connected_mqtt_client: RoborockMqttClientV1) -
         await connected_mqtt_client.async_disconnect()
 
 
+async def test_disconnect_failure_response(
+    received_requests: Queue,
+    response_queue: Queue,
+    connected_mqtt_client: RoborockMqttClientV1,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test the broker responding with a connect failure."""
+
+    # Enqueue a failed message -- however, the client does not process any
+    # further messages and there is no parsing error, and no failed log messages.
+    response_queue.put(mqtt_packet.gen_disconnect(reason_code=1))
+    assert connected_mqtt_client.is_connected()
+    with caplog.at_level(logging.ERROR, logger="homeassistant.components.nest"):
+        await connected_mqtt_client.async_disconnect()
+        assert not connected_mqtt_client.is_connected()
+        assert not caplog.records
+
+
 async def test_async_release(connected_mqtt_client: RoborockMqttClientV1) -> None:
     """Test the async_release API will disconnect the client."""
     await connected_mqtt_client.async_release()