From c3d623a37e4a1546726054b4ecf33cf63e5193a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 2 Aug 2021 19:35:11 +0200 Subject: [PATCH] Fix issue when data is None (#53875) --- homeassistant/components/energy/__init__.py | 2 ++ tests/components/energy/test_websocket_api.py | 1 + 2 files changed, 3 insertions(+) diff --git a/homeassistant/components/energy/__init__.py b/homeassistant/components/energy/__init__.py index c856ffb1541..30a1bf8e877 100644 --- a/homeassistant/components/energy/__init__.py +++ b/homeassistant/components/energy/__init__.py @@ -14,6 +14,8 @@ from .data import async_get_manager async def is_configured(hass: HomeAssistant) -> bool: """Return a boolean to indicate if energy is configured.""" manager = await async_get_manager(hass) + if manager.data is None: + return False return bool(manager.data != manager.default_preferences()) diff --git a/tests/components/energy/test_websocket_api.py b/tests/components/energy/test_websocket_api.py index 92e6cf3a5b5..a14a8d0986e 100644 --- a/tests/components/energy/test_websocket_api.py +++ b/tests/components/energy/test_websocket_api.py @@ -30,6 +30,7 @@ async def test_get_preferences_no_data(hass, hass_ws_client) -> None: async def test_get_preferences_default(hass, hass_ws_client, hass_storage) -> None: """Test we get preferences.""" + assert not await is_configured(hass) manager = await data.async_get_manager(hass) manager.data = data.EnergyManager.default_preferences() client = await hass_ws_client(hass)