test: explicitly disconnect threads

Author: allenporter

roborock/roborock_future.py

@@ -33,4 +33,7 @@ async def async_get(self, timeout: float | int) -> tuple[Any, VacuumError | None
             async with async_timeout.timeout(timeout):
                 return await self.fut
         finally:
-            self.fut.cancel()
+            try:
+                self.fut.cancel()
+            except Exception:
+                pass

tests/conftest.py

@@ -138,16 +138,22 @@ def handle_select(rlist: list, wlist: list, *args: Any) -> list:
 
 
 @pytest.fixture(name="mqtt_client")
-def mqtt_client(mock_create_connection: None, mock_select: None) -> Generator[RoborockMqttClientV1, None, None]:
+async def mqtt_client(mock_create_connection: None, mock_select: None) -> Generator[RoborockMqttClientV1, None, None]:
     user_data = UserData.from_dict(USER_DATA)
     home_data = HomeData.from_dict(HOME_DATA_RAW)
     device_info = DeviceData(
         device=home_data.devices[0],
         model=home_data.products[0].model,
     )
     client = RoborockMqttClientV1(user_data, device_info)
-    yield client
-    # Clean up any resources after the test
+    try:
+        yield client
+    finally:
+        if not client.is_connected():
+            try:
+                await client.async_release()
+            except Exception:
+                pass
 
 
 @pytest.fixture(name="mock_rest", autouse=True)
@@ -226,11 +232,19 @@ def handle_write(data: bytes) -> None:
 
 
 @pytest.fixture(name="local_client")
-def local_client_fixture(mock_create_local_connection: None) -> Generator[RoborockLocalClientV1, None, None]:
+async def local_client_fixture(mock_create_local_connection: None) -> Generator[RoborockLocalClientV1, None, None]:
     home_data = HomeData.from_dict(HOME_DATA_RAW)
     device_info = DeviceData(
         device=home_data.devices[0],
         model=home_data.products[0].model,
         host=TEST_LOCAL_API_HOST,
     )
-    yield RoborockLocalClientV1(device_info)
+    client = RoborockLocalClientV1(device_info)
+    try:
+        yield client
+    finally:
+        if not client.is_connected():
+            try:
+                await client.async_release()
+            except Exception:
+                pass

tests/test_a01_api.py

@@ -36,7 +36,7 @@
 
 
 @pytest.fixture(name="a01_mqtt_client")
-async def a01_mqtt_client_fixture(mock_create_connection: None, mock_select: None) -> RoborockMqttClientA01:
+async def a01_mqtt_client_fixture(mock_create_connection: None, mock_select: None) -> AsyncGenerator[RoborockMqttClientA01, None]:
     user_data = UserData.from_dict(USER_DATA)
     home_data = HomeData.from_dict(
         {
@@ -49,7 +49,15 @@ async def a01_mqtt_client_fixture(mock_create_connection: None, mock_select: Non
         device=home_data.devices[0],
         model=home_data.products[0].model,
     )
-    return RoborockMqttClientA01(user_data, device_info, RoborockCategory.WASHING_MACHINE)
+    client = RoborockMqttClientA01(user_data, device_info, RoborockCategory.WASHING_MACHINE)
+    try:
+        yield client
+    finally:
+        if not client.is_connected():
+            try:
+                await client.async_release()
+            except Exception:
+                pass
 
 
 @pytest.fixture(name="connected_a01_mqtt_client")