chore: update pytest-asyncio and fix clean shutdown (#434)

* chore: update pytest-asyncio and fix clean shutdown

* chore: add back generator exception handling

* chore: fix lint errors

Author: allenporter

poetry.lock

@@ -39,7 +39,7 @@ requires = ["poetry-core==1.8.0"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.group.dev.dependencies]
-pytest-asyncio = "*"
+pytest-asyncio = ">=1.1.0"
 pytest = "*"
 pre-commit = ">=3.5,<5.0"
 mypy = "*"

pyproject.toml

@@ -125,14 +125,14 @@ async def _run_task(self, start_future: asyncio.Future[None] | None) -> None:
             except Exception as err:
                 # This error is thrown when the MQTT loop is cancelled
                 # and the generator is not stopped.
-                if "generator didn't stop" in str(err):
+                if "generator didn't stop" in str(err) or "generator didn't yield" in str(err):
                     _LOGGER.debug("MQTT loop was cancelled")
                     return
                 if start_future:
                     _LOGGER.error("Uncaught error starting MQTT session: %s", err)
                     start_future.set_exception(err)
                     return
-                _LOGGER.error("Uncaught error during MQTT session: %s", err)
+                _LOGGER.exception("Uncaught error during MQTT session: %s", err)
 
             self._healthy = False
             _LOGGER.info("MQTT session disconnected, retrying in %s seconds", self._backoff.total_seconds())
@@ -180,7 +180,7 @@ async def _process_message_loop(self, client: aiomqtt.Client) -> None:
                 except asyncio.CancelledError:
                     raise
                 except Exception as e:
-                    _LOGGER.error("Uncaught exception in subscriber callback: %s", e)
+                    _LOGGER.exception("Uncaught exception in subscriber callback: %s", e)
 
     async def subscribe(self, topic: str, callback: Callable[[bytes], None]) -> Callable[[], None]:
         """Subscribe to messages on the specified topic and invoke the callback for new messages.

roborock/mqtt/roborock_session.py

@@ -1,7 +1,7 @@
 """Tests for the MQTT session module."""
 
 import asyncio
-from collections.abc import Callable, Generator
+from collections.abc import AsyncGenerator, Callable
 from queue import Queue
 from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
@@ -32,14 +32,16 @@ def mqtt_server_fixture(mock_create_connection: None, mock_select: None) -> None
 
 
 @pytest.fixture(autouse=True)
-def mock_client_fixture(event_loop: asyncio.AbstractEventLoop) -> Generator[None, None, None]:
+async def mock_client_fixture() -> AsyncGenerator[None, None]:
     """Fixture to patch the MQTT underlying sync client.
 
     The tests use fake sockets, so this ensures that the async mqtt client does not
     attempt to listen on them directly. We instead just poll the socket for
     data ourselves.
     """
 
+    event_loop = asyncio.get_running_loop()
+
     orig_class = mqtt.Client
 
     async def poll_sockets(client: mqtt.Client) -> None:
@@ -226,3 +228,4 @@ async def test_subscribe_failure() -> None:
             await session.subscribe("topic-1", subscriber1.append)
 
         assert not subscriber1.messages
+        await session.close()