chore: share test fixtures

Author: allenporter

tests/conftest.py

@@ -20,6 +20,11 @@
 from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from tests.mock_data import HOME_DATA_RAW, HOME_DATA_SCENES_RAW, TEST_LOCAL_API_HOST, USER_DATA
 
+# Fixtures for the newer APIs in subdirectories
+pytest_plugins = [
+    "tests.mqtt_fixtures",
+]
+
 _LOGGER = logging.getLogger(__name__)
 
 

tests/e2e/test_local_session.py

@@ -79,7 +79,9 @@ def build_response(
     return encoder(msg)
 
 
-async def test_connect(local_channel: LocalChannel, response_queue: Queue[bytes], received_requests: Queue[bytes]):
+async def test_connect(
+    local_channel: LocalChannel, response_queue: Queue[bytes], received_requests: Queue[bytes]
+) -> None:
     """Test connecting to the device."""
     # Queue HELLO response with payload to ensure it can be parsed
     response_queue.put(build_response(RoborockMessageProtocol.HELLO_RESPONSE, 1, payload=b"ok", random=TEST_RANDOM))
@@ -101,7 +103,9 @@ async def test_connect(local_channel: LocalChannel, response_queue: Queue[bytes]
     assert int.from_bytes(protocol_bytes, "big") == RoborockMessageProtocol.HELLO_REQUEST
 
 
-async def test_send_command(local_channel: LocalChannel, response_queue: Queue[bytes], received_requests: Queue[bytes]):
+async def test_send_command(
+    local_channel: LocalChannel, response_queue: Queue[bytes], received_requests: Queue[bytes]
+) -> None:
     """Test sending a command."""
     # Queue HELLO response
     response_queue.put(build_response(RoborockMessageProtocol.HELLO_RESPONSE, 1, payload=b"ok", random=TEST_RANDOM))

tests/e2e/test_mqtt_session.py

@@ -3,6 +3,9 @@
 These tests use a fake MQTT broker to verify the session implementation. We
 mock out the lower level socket connections to simulate a broker which gets us
 close to an "end to end" test without needing an actual MQTT broker server.
+
+These are higher level tests that the similar tests in tests/mqtt/test_roborock_session.py
+which use mocks to verify specific behaviors.
 """
 
 from collections.abc import AsyncGenerator, Callable
@@ -16,10 +19,7 @@
 from roborock.roborock_message import RoborockMessage, RoborockMessageProtocol
 from tests import mqtt_packet
 from tests.mock_data import LOCAL_KEY
-from tests.mqtt.common import (
-    FAKE_PARAMS,
-    Subscriber,
-)
+from tests.mqtt_fixtures import FAKE_PARAMS, Subscriber
 
 
 @pytest.fixture(autouse=True)
@@ -96,7 +96,7 @@ async def test_session_e2e_publish_message(
 ) -> None:
     """Test publishing a real Roborock message."""
 
-    # Publish a message to the broker
+    # Publish a message to the brokwer
     msg = RoborockMessage(
         protocol=RoborockMessageProtocol.RPC_REQUEST,
         payload=b'{"method":"get_status"}',

tests/mqtt/test_roborock_session.py

@@ -11,10 +11,7 @@
 from roborock.mqtt.roborock_session import RoborockMqttSession, create_mqtt_session
 from roborock.mqtt.session import MqttParams, MqttSessionException, MqttSessionUnauthorized
 from tests import mqtt_packet
-from tests.mqtt.common import (
-    FAKE_PARAMS,
-    Subscriber,
-)
+from tests.mqtt_fixtures import FAKE_PARAMS, Subscriber
 
 
 @pytest.fixture(autouse=True)