From d2e5c85429a8a258a4aeb81c029535e4dec17851 Mon Sep 17 00:00:00 2001 From: jan iversen Date: Fri, 11 Mar 2022 18:58:18 +0100 Subject: [PATCH] Remove pragma from discover check. (#68002) --- homeassistant/components/modbus/binary_sensor.py | 2 +- homeassistant/components/modbus/cover.py | 2 +- homeassistant/components/modbus/fan.py | 2 +- homeassistant/components/modbus/light.py | 2 +- homeassistant/components/modbus/sensor.py | 2 +- homeassistant/components/modbus/switch.py | 2 +- tests/components/modbus/test_binary_sensor.py | 14 ++++++++++++++ tests/components/modbus/test_climate.py | 2 +- tests/components/modbus/test_cover.py | 14 ++++++++++++++ tests/components/modbus/test_fan.py | 13 +++++++++++++ tests/components/modbus/test_light.py | 13 +++++++++++++ tests/components/modbus/test_sensor.py | 14 ++++++++++++++ tests/components/modbus/test_switch.py | 13 +++++++++++++ 13 files changed, 88 insertions(+), 7 deletions(-) diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py index 50281bd2b29..c432c102492 100644 --- a/homeassistant/components/modbus/binary_sensor.py +++ b/homeassistant/components/modbus/binary_sensor.py @@ -39,7 +39,7 @@ async def async_setup_platform( ) -> None: """Set up the Modbus binary sensors.""" - if discovery_info is None: # pragma: no cover + if discovery_info is None: return sensors: list[ModbusBinarySensor | SlaveSensor] = [] diff --git a/homeassistant/components/modbus/cover.py b/homeassistant/components/modbus/cover.py index 1a9a7a82e9c..a01f732ef13 100644 --- a/homeassistant/components/modbus/cover.py +++ b/homeassistant/components/modbus/cover.py @@ -45,7 +45,7 @@ async def async_setup_platform( discovery_info: DiscoveryInfoType | None = None, ) -> None: """Read configuration and create Modbus cover.""" - if discovery_info is None: # pragma: no cover + if discovery_info is None: return covers = [] diff --git a/homeassistant/components/modbus/fan.py b/homeassistant/components/modbus/fan.py index 6e2bf101de2..a986b243c1b 100644 --- a/homeassistant/components/modbus/fan.py +++ b/homeassistant/components/modbus/fan.py @@ -24,7 +24,7 @@ async def async_setup_platform( discovery_info: DiscoveryInfoType | None = None, ) -> None: """Read configuration and create Modbus fans.""" - if discovery_info is None: # pragma: no cover + if discovery_info is None: return fans = [] diff --git a/homeassistant/components/modbus/light.py b/homeassistant/components/modbus/light.py index cc5936050e8..2313dd9bacb 100644 --- a/homeassistant/components/modbus/light.py +++ b/homeassistant/components/modbus/light.py @@ -23,7 +23,7 @@ async def async_setup_platform( discovery_info: DiscoveryInfoType | None = None, ) -> None: """Read configuration and create Modbus lights.""" - if discovery_info is None: # pragma: no cover + if discovery_info is None: return lights = [] diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py index d4f3d1f28b6..7e9295fdb14 100644 --- a/homeassistant/components/modbus/sensor.py +++ b/homeassistant/components/modbus/sensor.py @@ -34,7 +34,7 @@ async def async_setup_platform( ) -> None: """Set up the Modbus sensors.""" - if discovery_info is None: # pragma: no cover + if discovery_info is None: return sensors: list[ModbusRegisterSensor | SlaveSensor] = [] diff --git a/homeassistant/components/modbus/switch.py b/homeassistant/components/modbus/switch.py index 5844daf648e..beb84096006 100644 --- a/homeassistant/components/modbus/switch.py +++ b/homeassistant/components/modbus/switch.py @@ -25,7 +25,7 @@ async def async_setup_platform( """Read configuration and create Modbus switches.""" switches = [] - if discovery_info is None: # pragma: no cover + if discovery_info is None: return for entry in discovery_info[CONF_SWITCHES]: diff --git a/tests/components/modbus/test_binary_sensor.py b/tests/components/modbus/test_binary_sensor.py index e307d1b6149..bca63321597 100644 --- a/tests/components/modbus/test_binary_sensor.py +++ b/tests/components/modbus/test_binary_sensor.py @@ -8,6 +8,7 @@ from homeassistant.components.modbus.const import ( CONF_INPUT_TYPE, CONF_LAZY_ERROR, CONF_SLAVE_COUNT, + MODBUS_DOMAIN, ) from homeassistant.const import ( CONF_ADDRESS, @@ -22,6 +23,7 @@ from homeassistant.const import ( STATE_UNKNOWN, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle @@ -377,3 +379,15 @@ async def test_slave_binary_sensor(hass, expected, slaves, mock_do_cycle): for i in range(len(slaves)): entity_id = f"{SENSOR_DOMAIN}.{TEST_ENTITY_NAME}_{i+1}".replace(" ", "_") assert hass.states.get(entity_id).state == slaves[i] + + +async def test_no_discovery_info_binary_sensor(hass, caplog): + """Test setup without discovery info.""" + assert SENSOR_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + SENSOR_DOMAIN, + {SENSOR_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert SENSOR_DOMAIN in hass.config.components diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index 54888e069ed..a2c83a60640 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -303,7 +303,7 @@ async def test_wrong_unpack_climate(hass, mock_do_cycle): assert hass.states.get(ENTITY_ID).state == STATE_UNAVAILABLE -async def test_no_discovery_info(hass, caplog): +async def test_no_discovery_info_climate(hass, caplog): """Test setup without discovery info.""" assert CLIMATE_DOMAIN not in hass.config.components assert await async_setup_component( diff --git a/tests/components/modbus/test_cover.py b/tests/components/modbus/test_cover.py index 6797dc8713c..3e545f1c1ab 100644 --- a/tests/components/modbus/test_cover.py +++ b/tests/components/modbus/test_cover.py @@ -15,6 +15,7 @@ from homeassistant.components.modbus.const import ( CONF_STATE_OPENING, CONF_STATUS_REGISTER, CONF_STATUS_REGISTER_TYPE, + MODBUS_DOMAIN, ) from homeassistant.const import ( CONF_ADDRESS, @@ -29,6 +30,7 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle @@ -307,3 +309,15 @@ async def test_service_cover_move(hass, mock_modbus, mock_ha): "cover", "close_cover", {"entity_id": ENTITY_ID2}, blocking=True ) assert hass.states.get(ENTITY_ID2).state == STATE_UNAVAILABLE + + +async def test_no_discovery_info_cover(hass, caplog): + """Test setup without discovery info.""" + assert COVER_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + COVER_DOMAIN, + {COVER_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert COVER_DOMAIN in hass.config.components diff --git a/tests/components/modbus/test_fan.py b/tests/components/modbus/test_fan.py index 9b0564504d9..3baa23b2791 100644 --- a/tests/components/modbus/test_fan.py +++ b/tests/components/modbus/test_fan.py @@ -29,6 +29,7 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_NAME, ReadResult @@ -309,3 +310,15 @@ async def test_service_fan_update(hass, mock_modbus, mock_ha): "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True ) assert hass.states.get(ENTITY_ID).state == STATE_ON + + +async def test_no_discovery_info_fan(hass, caplog): + """Test setup without discovery info.""" + assert FAN_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + FAN_DOMAIN, + {FAN_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert FAN_DOMAIN in hass.config.components diff --git a/tests/components/modbus/test_light.py b/tests/components/modbus/test_light.py index f98f1105fa0..7ef13c0c712 100644 --- a/tests/components/modbus/test_light.py +++ b/tests/components/modbus/test_light.py @@ -29,6 +29,7 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_NAME, ReadResult @@ -309,3 +310,15 @@ async def test_service_light_update(hass, mock_modbus, mock_ha): "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True ) assert hass.states.get(ENTITY_ID).state == STATE_ON + + +async def test_no_discovery_info_light(hass, caplog): + """Test setup without discovery info.""" + assert LIGHT_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + LIGHT_DOMAIN, + {LIGHT_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert LIGHT_DOMAIN in hass.config.components diff --git a/tests/components/modbus/test_sensor.py b/tests/components/modbus/test_sensor.py index 4e4e2e284cf..b1432876a97 100644 --- a/tests/components/modbus/test_sensor.py +++ b/tests/components/modbus/test_sensor.py @@ -15,6 +15,7 @@ from homeassistant.components.modbus.const import ( CONF_SWAP_NONE, CONF_SWAP_WORD, CONF_SWAP_WORD_BYTE, + MODBUS_DOMAIN, DataType, ) from homeassistant.components.sensor import ( @@ -36,6 +37,7 @@ from homeassistant.const import ( STATE_UNKNOWN, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle @@ -820,3 +822,15 @@ async def test_service_sensor_update(hass, mock_modbus, mock_ha): "homeassistant", "update_entity", {"entity_id": ENTITY_ID}, blocking=True ) assert hass.states.get(ENTITY_ID).state == "32" + + +async def test_no_discovery_info_sensor(hass, caplog): + """Test setup without discovery info.""" + assert SENSOR_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + SENSOR_DOMAIN, + {SENSOR_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert SENSOR_DOMAIN in hass.config.components diff --git a/tests/components/modbus/test_switch.py b/tests/components/modbus/test_switch.py index 006e7ee8d15..4d7a48d120f 100644 --- a/tests/components/modbus/test_switch.py +++ b/tests/components/modbus/test_switch.py @@ -34,6 +34,7 @@ from homeassistant.const import ( STATE_UNAVAILABLE, ) from homeassistant.core import State +from homeassistant.setup import async_setup_component import homeassistant.util.dt as dt_util from .conftest import TEST_ENTITY_NAME, ReadResult, do_next_cycle @@ -395,3 +396,15 @@ async def test_delay_switch(hass, mock_modbus): async_fire_time_changed(hass, now) await hass.async_block_till_done() assert hass.states.get(ENTITY_ID).state == STATE_ON + + +async def test_no_discovery_info_switch(hass, caplog): + """Test setup without discovery info.""" + assert SWITCH_DOMAIN not in hass.config.components + assert await async_setup_component( + hass, + SWITCH_DOMAIN, + {SWITCH_DOMAIN: {"platform": MODBUS_DOMAIN}}, + ) + await hass.async_block_till_done() + assert SWITCH_DOMAIN in hass.config.components