Skip to content

Fix Plugwise recovering from aiohttp client error #71642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frenck merged 1 commit into from
May 10, 2022
Merged

Fix Plugwise recovering from aiohttp client error #71642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion homeassistant/components/plugwise/gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import asyncio
from typing import Any

from aiohttp import ClientConnectionError
from plugwise.exceptions import InvalidAuthentication, PlugwiseException
from plugwise.smile import Smile

Expand Down Expand Up @@ -44,7 +45,7 @@ async def async_setup_entry_gw(hass: HomeAssistant, entry: ConfigEntry) -> bool:
except InvalidAuthentication:
LOGGER.error("Invalid username or Smile ID")
return False
except PlugwiseException as err:
except (ClientConnectionError, PlugwiseException) as err:
Copy link
Copy Markdown
Member

@MartinHjelmare MartinHjelmare May 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Longterm this should probably be caught by the library and raised as a library exception.

Copy link
Copy Markdown
Member Author

@frenck frenck May 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, agree.

CC @CoMPaTech @bouwew

Copy link
Copy Markdown
Member Author

@frenck frenck May 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upstream issue: plugwise/python-plugwise#187

Copy link
Copy Markdown
Contributor

@bouwew bouwew May 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've fixed this in plugwise-beta some time ago, in almost the same way.

We need to think about how to do this in the library...

raise ConfigEntryNotReady(
f"Error while communicating to device {api.smile_name}"
) from err
Expand Down
2 changes: 2 additions & 0 deletions tests/components/plugwise/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import asyncio
from unittest.mock import MagicMock

import aiohttp
from plugwise.exceptions import (
ConnectionFailedError,
PlugwiseException,
Expand Down Expand Up @@ -49,6 +50,7 @@ async def test_load_unload_config_entry(
(PlugwiseException),
(XMLDataMissingError),
(asyncio.TimeoutError),
(aiohttp.ClientConnectionError),
],
)
async def test_config_entry_not_ready(
Expand Down