Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not directly call async_setup_entry in MQTT tests (#111010)

pull/108245/head
Jan Bouwhuis 2024-02-21 07:47:30 +01:00 committed by GitHub
parent 5b73adba20
commit c048b840fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/components/mqtt/test_init.py
View File

@ -181,7 +181,7 @@ async def test_mqtt_await_ack_at_disconnect(
data={"certificate": "auto", mqtt.CONF_BROKER: "test-broker"}, data={"certificate": "auto", mqtt.CONF_BROKER: "test-broker"},
) )
entry.add_to_hass(hass) entry.add_to_hass(hass)
assert await mqtt.async_setup_entry(hass, entry) assert await hass.config_entries.async_setup(entry.entry_id)
mqtt_client = mock_client.return_value mqtt_client = mock_client.return_value
# publish from MQTT client without awaiting # publish from MQTT client without awaiting
@ -1998,8 +1998,7 @@ async def test_initial_setup_logs_error(
entry.add_to_hass(hass) entry.add_to_hass(hass)
mqtt_client_mock.connect.return_value = 1 mqtt_client_mock.connect.return_value = 1
try: try:
assert await mqtt.async_setup_entry(hass, entry) assert await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
except HomeAssistantError: except HomeAssistantError:
assert True assert True
assert "Failed to connect to MQTT server:" in caplog.text assert "Failed to connect to MQTT server:" in caplog.text
@ -2054,8 +2053,7 @@ async def test_publish_error(
with patch("paho.mqtt.client.Client") as mock_client: with patch("paho.mqtt.client.Client") as mock_client:
mock_client().connect = lambda *args: 1 mock_client().connect = lambda *args: 1
mock_client().publish().rc = 1 mock_client().publish().rc = 1
assert await mqtt.async_setup_entry(hass, entry) assert await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
with pytest.raises(HomeAssistantError): with pytest.raises(HomeAssistantError):
await mqtt.async_publish( await mqtt.async_publish(
hass, "some-topic", b"test-payload", qos=0, retain=False, encoding=None hass, "some-topic", b"test-payload", qos=0, retain=False, encoding=None
@ -2234,8 +2232,7 @@ async def test_handle_mqtt_timeout_on_callback(
# Make sure we are connected correctly # Make sure we are connected correctly
mock_client.on_connect(mock_client, None, None, 0) mock_client.on_connect(mock_client, None, None, 0)
# Set up the integration # Set up the integration
assert await mqtt.async_setup_entry(hass, entry) assert await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done()
# Now call we publish without simulating and ACK callback # Now call we publish without simulating and ACK callback
await mqtt.async_publish(hass, "no_callback/test-topic", "test-payload") await mqtt.async_publish(hass, "no_callback/test-topic", "test-payload")
@ -2254,7 +2251,7 @@ async def test_setup_raises_config_entry_not_ready_if_no_connect_broker(
with patch("paho.mqtt.client.Client") as mock_client: with patch("paho.mqtt.client.Client") as mock_client:
mock_client().connect = MagicMock(side_effect=OSError("Connection error")) mock_client().connect = MagicMock(side_effect=OSError("Connection error"))
assert await mqtt.async_setup_entry(hass, entry) assert await hass.config_entries.async_setup(entry.entry_id)
await hass.async_block_till_done() await hass.async_block_till_done()
assert "Failed to connect to MQTT server due to exception:" in caplog.text assert "Failed to connect to MQTT server due to exception:" in caplog.text