From d7c4a669f164cb536cc6c6571f9e287c4c608f3c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 2 Dec 2021 10:13:41 -1000
Subject: [PATCH] Revert "Use HassioServiceInfo in mqtt tests" (#60867)

---
 tests/components/mqtt/test_config_flow.py | 27 +++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/tests/components/mqtt/test_config_flow.py b/tests/components/mqtt/test_config_flow.py
index 91f8483bde6..208541d702c 100644
--- a/tests/components/mqtt/test_config_flow.py
+++ b/tests/components/mqtt/test_config_flow.py
@@ -7,7 +7,6 @@ import voluptuous as vol
 
 from homeassistant import config_entries, data_entry_flow
 from homeassistant.components import mqtt
-from homeassistant.components.hassio.discovery import HassioServiceInfo
 from homeassistant.core import HomeAssistant
 from homeassistant.setup import async_setup_component
 
@@ -111,9 +110,7 @@ async def test_hassio_already_configured(hass):
     MockConfigEntry(domain="mqtt").add_to_hass(hass)
 
     result = await hass.config_entries.flow.async_init(
-        "mqtt",
-        context={"source": config_entries.SOURCE_HASSIO},
-        data=HassioServiceInfo(config={}),
+        "mqtt", context={"source": config_entries.SOURCE_HASSIO}
     )
     assert result["type"] == "abort"
     assert result["reason"] == "already_configured"
@@ -127,9 +124,7 @@ async def test_hassio_ignored(hass: HomeAssistant) -> None:
 
     result = await hass.config_entries.flow.async_init(
         mqtt.DOMAIN,
-        data=HassioServiceInfo(
-            config={"addon": "Mosquitto", "host": "mock-mosquitto", "port": "1883"}
-        ),
+        data={"addon": "Mosquitto", "host": "mock-mosquitto", "port": "1883"},
         context={"source": config_entries.SOURCE_HASSIO},
     )
     assert result
@@ -145,16 +140,14 @@ async def test_hassio_confirm(
 
     result = await hass.config_entries.flow.async_init(
         "mqtt",
-        data=HassioServiceInfo(
-            config={
-                "addon": "Mock Addon",
-                "host": "mock-broker",
-                "port": 1883,
-                "username": "mock-user",
-                "password": "mock-pass",
-                "protocol": "3.1.1",
-            }
-        ),
+        data={
+            "addon": "Mock Addon",
+            "host": "mock-broker",
+            "port": 1883,
+            "username": "mock-user",
+            "password": "mock-pass",
+            "protocol": "3.1.1",
+        },
         context={"source": config_entries.SOURCE_HASSIO},
     )
     assert result["type"] == "form"