Fix custom account config flow setup

home-assistant · Oct 6, 2024 · c1c7490 · c1c7490
1 parent 4721f8e
commit c1c7490
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/homeassistant/components/ovo_energy/__init__.py b/homeassistant/components/ovo_energy/__init__.py
@@ -32,7 +32,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         client_session=async_get_clientsession(hass),
     )
 
-    if custom_account := entry.data.get(CONF_ACCOUNT) is not None:
+    if (custom_account := entry.data.get(CONF_ACCOUNT)) is not None:
         client.custom_account_id = custom_account
 
     try:
@@ -49,7 +49,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     async def async_update_data() -> OVODailyUsage:
         """Fetch data from OVO Energy."""
-        if custom_account := entry.data.get(CONF_ACCOUNT) is not None:
+        if (custom_account := entry.data.get(CONF_ACCOUNT)) is not None:
             client.custom_account_id = custom_account
 
         async with asyncio.timeout(10):

diff --git a/homeassistant/components/ovo_energy/config_flow.py b/homeassistant/components/ovo_energy/config_flow.py
@@ -46,7 +46,7 @@ async def async_step_user(
                 client_session=async_get_clientsession(self.hass),
             )
 
-            if custom_account := user_input.get(CONF_ACCOUNT) is not None:
+            if (custom_account := user_input.get(CONF_ACCOUNT)) is not None:
                 client.custom_account_id = custom_account
 
             try:

diff --git a/tests/components/ovo_energy/test_config_flow.py b/tests/components/ovo_energy/test_config_flow.py
@@ -117,6 +117,7 @@ async def test_full_flow_implementation(hass: HomeAssistant) -> None:
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["data"][CONF_USERNAME] == FIXTURE_USER_INPUT[CONF_USERNAME]
     assert result2["data"][CONF_PASSWORD] == FIXTURE_USER_INPUT[CONF_PASSWORD]
+    assert result2["data"][CONF_ACCOUNT] == FIXTURE_USER_INPUT[CONF_ACCOUNT]
 
 
 async def test_reauth_authorization_error(hass: HomeAssistant) -> None: