Remove pragma from discover check. (#68002)

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] = []

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 = []

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 = []
 

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 = []

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] = []

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]:

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

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(

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

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

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

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

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