Catch ApiError while checking credentials in NAM integration (#81243)

* Catch ApiError while checking credentials

* Update tests

* Suggested change

homeassistant/components/nam/__init__.py

@@ -56,6 +56,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     try:
         await nam.async_check_credentials()
+    except ApiError as err:
+        raise ConfigEntryNotReady from err
     except AuthFailed as err:
         raise ConfigEntryAuthFailed from err
 

tests/components/nam/test_init.py

@@ -32,12 +32,30 @@ async def test_config_not_ready(hass):
         unique_id="aa:bb:cc:dd:ee:ff",
         data={"host": "10.10.2.3"},
     )
+    entry.add_to_hass(hass)
 
     with patch(
         "homeassistant.components.nam.NettigoAirMonitor.initialize",
         side_effect=ApiError("API Error"),
     ):
+        await hass.config_entries.async_setup(entry.entry_id)
+        assert entry.state is ConfigEntryState.SETUP_RETRY
+
+
+async def test_config_not_ready_while_checking_credentials(hass):
+    """Test for setup failure if the connection fails while checking credentials."""
+    entry = MockConfigEntry(
+        domain=DOMAIN,
+        title="10.10.2.3",
+        unique_id="aa:bb:cc:dd:ee:ff",
+        data={"host": "10.10.2.3"},
+    )
     entry.add_to_hass(hass)
+
+    with patch("homeassistant.components.nam.NettigoAirMonitor.initialize"), patch(
+        "homeassistant.components.nam.NettigoAirMonitor.async_check_credentials",
+        side_effect=ApiError("API Error"),
+    ):
         await hass.config_entries.async_setup(entry.entry_id)
         assert entry.state is ConfigEntryState.SETUP_RETRY
 
@@ -50,12 +68,12 @@ async def test_config_auth_failed(hass):
         unique_id="aa:bb:cc:dd:ee:ff",
         data={"host": "10.10.2.3"},
     )
+    entry.add_to_hass(hass)
 
     with patch(
         "homeassistant.components.nam.NettigoAirMonitor.async_check_credentials",
         side_effect=AuthFailed("Authorization has failed"),
     ):
-        entry.add_to_hass(hass)
         await hass.config_entries.async_setup(entry.entry_id)
         assert entry.state is ConfigEntryState.SETUP_ERROR