@@ -49,24 +49,28 @@ async def test_get_base_url_no_url():
49
49
rc = RoborockApiClient (
"[email protected] " )
50
50
with patch ("roborock.web_api.PreparedRequest.request" ) as mock_request :
51
51
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"
54
54
55
55
56
56
async def test_request_code ():
57
57
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
+ ):
61
63
mock_request .return_value = GET_CODE_RESPONSE
62
64
await rc .request_code ()
63
65
64
66
65
67
async def test_get_home_data ():
66
68
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
+ ):
70
74
mock_prepared_request .side_effect = [
71
75
{"code" : 200 , "msg" : "success" , "data" : {"rrHomeId" : 1 }},
72
76
{"code" : 200 , "success" : True , "result" : HOME_DATA_RAW },
@@ -117,10 +121,11 @@ async def test_get_prop():
117
121
home_data = HomeData .from_dict (HOME_DATA_RAW )
118
122
device_info = DeviceData (device = home_data .devices [0 ], model = home_data .products [0 ].model )
119
123
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" ),
124
129
):
125
130
status = S7MaxVStatus .from_dict (STATUS )
126
131
status .dock_type = RoborockDockTypeCode .auto_empty_dock_pure
@@ -194,8 +199,9 @@ async def test_disconnect_failure(connected_mqtt_client: RoborockMqttClientV1) -
194
199
assert connected_mqtt_client .is_connected ()
195
200
196
201
# 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" ),
199
205
):
200
206
await connected_mqtt_client .async_disconnect ()
201
207
@@ -231,8 +237,9 @@ async def test_subscribe_failure(
231
237
232
238
response_queue .put (mqtt_packet .gen_connack (rc = 0 , flags = 2 ))
233
239
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" ),
236
243
):
237
244
await mqtt_client .async_connect ()
238
245
@@ -298,8 +305,9 @@ async def test_publish_failure(
298
305
299
306
msg = mqtt .MQTTMessageInfo (0 )
300
307
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" ),
303
311
):
304
312
await connected_mqtt_client .get_room_mapping ()
305
313
@@ -308,7 +316,8 @@ async def test_future_timeout(
308
316
connected_mqtt_client : RoborockMqttClientV1 ,
309
317
) -> None :
310
318
"""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" ),
313
322
):
314
323
await connected_mqtt_client .get_room_mapping ()
0 commit comments