Avoid listening to sockets/fds

Author: allenporter

tests/conftest.py

@@ -118,7 +118,6 @@ def mock_sock_fixture(fake_socket_handler: FakeSocketHandler) -> Mock:
     mock_sock.recv = fake_socket_handler.handle_socket_recv
     mock_sock.send = fake_socket_handler.handle_socket_send
     mock_sock.pending = fake_socket_handler.pending
-    mock_sock.fileno = lambda: 1
     return mock_sock
 
 

tests/mqtt/test_roborock_session.py

@@ -32,26 +32,36 @@ 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]:
-    """Fixture to patch the MQTT underlying sync client to regularly read from the mock socket."""
+    """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.
+    """
 
     orig_class = mqtt.Client
 
-    async def ready_loop(client: mqtt.Client) -> None:
-        """Run the mqtt read loop."""
+    async def poll_sockets(client: mqtt.Client) -> None:
+        """Poll the mqtt client sockets in a loop to pick up new data."""
         while True:
-            client.loop_read()
-            # event_loop.call_soon_threadsafe(client.loop_read)
+            event_loop.call_soon_threadsafe(client.loop_read)
+            event_loop.call_soon_threadsafe(client.loop_write)
             await asyncio.sleep(0.1)
 
     task: asyncio.Task[None] | None = None
 
     def new_client(*args: Any, **kwargs: Any) -> mqtt.Client:
+        """Create a new mqtt client and start the socket polling task."""
         nonlocal task
         client = orig_class(*args, **kwargs)
-        task = event_loop.create_task(ready_loop(client))
+        task = event_loop.create_task(poll_sockets(client))
         return client
 
-    with patch("aiomqtt.client.mqtt.Client", side_effect=new_client):
+    with patch("aiomqtt.client.Client._on_socket_open"), patch("aiomqtt.client.Client._on_socket_close"), patch(
+        "aiomqtt.client.Client._on_socket_register_write"
+    ), patch("aiomqtt.client.Client._on_socket_unregister_write"), patch(
+        "aiomqtt.client.mqtt.Client", side_effect=new_client
+    ):
         yield
         if task:
             task.cancel()