Fix merge problems

home-assistant · Feb 9, 2023 · 2d4e37f · 2d4e37f
1 parent bc45133
commit 2d4e37f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/tests/components/aurora_abb_powerone/test_config_flow.py b/tests/components/aurora_abb_powerone/test_config_flow.py
@@ -1,5 +1,4 @@
 """Test the Aurora ABB PowerOne Solar PV config flow."""
-from logging import INFO
 from unittest.mock import patch
 
 from aurorapy.client import AuroraError, AuroraTimeoutError
@@ -49,9 +48,6 @@ async def test_form(hass: HomeAssistant) -> None:
     ), patch(
         "aurorapy.client.AuroraSerialClient.firmware",
         return_value="1.234",
-    ), patch(
-        "homeassistant.components.aurora_abb_powerone.config_flow._LOGGER.getEffectiveLevel",
-        return_value=INFO,
     ) as mock_setup, patch(
         "homeassistant.components.aurora_abb_powerone.async_setup_entry",
         return_value=True,

diff --git a/tests/components/aurora_abb_powerone/test_sensor.py b/tests/components/aurora_abb_powerone/test_sensor.py
@@ -14,6 +14,7 @@
     SCAN_INTERVAL,
 )
 from homeassistant.const import CONF_ADDRESS, CONF_PORT, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant
 import homeassistant.util.dt as dt_util
 
 from tests.common import MockConfigEntry, async_fire_time_changed