Skip to content

Commit e12088d

Browse files
committed
fix: tests
1 parent a444eae commit e12088d

File tree

1 file changed

+29
-20
lines changed

1 file changed

+29
-20
lines changed

tests/test_api.py

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,28 @@ async def test_get_base_url_no_url():
4949
rc = RoborockApiClient("[email protected]")
5050
with patch("roborock.web_api.PreparedRequest.request") as mock_request:
5151
mock_request.return_value = BASE_URL_REQUEST
52-
await rc._get_base_url()
53-
assert rc.base_url == "https://sample.com"
52+
await rc._get_iot_login_info()
53+
assert await rc.base_url == "https://sample.com"
5454

5555

5656
async def test_request_code():
5757
rc = RoborockApiClient("[email protected]")
58-
with patch("roborock.web_api.RoborockApiClient._get_base_url"), patch(
59-
"roborock.web_api.RoborockApiClient._get_header_client_id"
60-
), patch("roborock.web_api.PreparedRequest.request") as mock_request:
58+
with (
59+
patch("roborock.web_api.RoborockApiClient._get_iot_login_info"),
60+
patch("roborock.web_api.RoborockApiClient._get_header_client_id"),
61+
patch("roborock.web_api.PreparedRequest.request") as mock_request,
62+
):
6163
mock_request.return_value = GET_CODE_RESPONSE
6264
await rc.request_code()
6365

6466

6567
async def test_get_home_data():
6668
rc = RoborockApiClient("[email protected]")
67-
with patch("roborock.web_api.RoborockApiClient._get_base_url"), patch(
68-
"roborock.web_api.RoborockApiClient._get_header_client_id"
69-
), patch("roborock.web_api.PreparedRequest.request") as mock_prepared_request:
69+
with (
70+
patch("roborock.web_api.RoborockApiClient._get_iot_login_info"),
71+
patch("roborock.web_api.RoborockApiClient._get_header_client_id"),
72+
patch("roborock.web_api.PreparedRequest.request") as mock_prepared_request,
73+
):
7074
mock_prepared_request.side_effect = [
7175
{"code": 200, "msg": "success", "data": {"rrHomeId": 1}},
7276
{"code": 200, "success": True, "result": HOME_DATA_RAW},
@@ -117,10 +121,11 @@ async def test_get_prop():
117121
home_data = HomeData.from_dict(HOME_DATA_RAW)
118122
device_info = DeviceData(device=home_data.devices[0], model=home_data.products[0].model)
119123
rmc = RoborockMqttClientV1(UserData.from_dict(USER_DATA), device_info)
120-
with patch("roborock.version_1_apis.roborock_mqtt_client_v1.RoborockMqttClientV1.get_status") as get_status, patch(
121-
"roborock.version_1_apis.roborock_client_v1.RoborockClientV1.send_command"
122-
), patch("roborock.version_1_apis.roborock_client_v1.AttributeCache.async_value"), patch(
123-
"roborock.version_1_apis.roborock_mqtt_client_v1.RoborockMqttClientV1.get_dust_collection_mode"
124+
with (
125+
patch("roborock.version_1_apis.roborock_mqtt_client_v1.RoborockMqttClientV1.get_status") as get_status,
126+
patch("roborock.version_1_apis.roborock_client_v1.RoborockClientV1.send_command"),
127+
patch("roborock.version_1_apis.roborock_client_v1.AttributeCache.async_value"),
128+
patch("roborock.version_1_apis.roborock_mqtt_client_v1.RoborockMqttClientV1.get_dust_collection_mode"),
124129
):
125130
status = S7MaxVStatus.from_dict(STATUS)
126131
status.dock_type = RoborockDockTypeCode.auto_empty_dock_pure
@@ -194,8 +199,9 @@ async def test_disconnect_failure(connected_mqtt_client: RoborockMqttClientV1) -
194199
assert connected_mqtt_client.is_connected()
195200

196201
# Make the MQTT client returns with an error when disconnecting
197-
with patch("roborock.cloud_api.mqtt.Client.disconnect", return_value=mqtt.MQTT_ERR_PROTOCOL), pytest.raises(
198-
RoborockException, match="Failed to disconnect"
202+
with (
203+
patch("roborock.cloud_api.mqtt.Client.disconnect", return_value=mqtt.MQTT_ERR_PROTOCOL),
204+
pytest.raises(RoborockException, match="Failed to disconnect"),
199205
):
200206
await connected_mqtt_client.async_disconnect()
201207

@@ -231,8 +237,9 @@ async def test_subscribe_failure(
231237

232238
response_queue.put(mqtt_packet.gen_connack(rc=0, flags=2))
233239

234-
with patch("roborock.cloud_api.mqtt.Client.subscribe", return_value=(mqtt.MQTT_ERR_NO_CONN, None)), pytest.raises(
235-
RoborockException, match="Failed to subscribe"
240+
with (
241+
patch("roborock.cloud_api.mqtt.Client.subscribe", return_value=(mqtt.MQTT_ERR_NO_CONN, None)),
242+
pytest.raises(RoborockException, match="Failed to subscribe"),
236243
):
237244
await mqtt_client.async_connect()
238245

@@ -298,8 +305,9 @@ async def test_publish_failure(
298305

299306
msg = mqtt.MQTTMessageInfo(0)
300307
msg.rc = mqtt.MQTT_ERR_PROTOCOL
301-
with patch("roborock.cloud_api.mqtt.Client.publish", return_value=msg), pytest.raises(
302-
RoborockException, match="Failed to publish"
308+
with (
309+
patch("roborock.cloud_api.mqtt.Client.publish", return_value=msg),
310+
pytest.raises(RoborockException, match="Failed to publish"),
303311
):
304312
await connected_mqtt_client.get_room_mapping()
305313

@@ -308,7 +316,8 @@ async def test_future_timeout(
308316
connected_mqtt_client: RoborockMqttClientV1,
309317
) -> None:
310318
"""Test a timeout raised while waiting for an RPC response."""
311-
with patch("roborock.roborock_future.async_timeout.timeout", side_effect=asyncio.TimeoutError), pytest.raises(
312-
RoborockTimeout, match="Timeout after"
319+
with (
320+
patch("roborock.roborock_future.async_timeout.timeout", side_effect=asyncio.TimeoutError),
321+
pytest.raises(RoborockTimeout, match="Timeout after"),
313322
):
314323
await connected_mqtt_client.get_room_mapping()

0 commit comments

Comments
 (0)