Fix shelly device_trigger tests by epenet · Pull Request #169305 · home-assistant/core

epenet · 2026-04-27T15:52:34Z

Proposed change

Linked to https://github.com/home-assistant/core/actions/runs/24982630534/job/73149424430?pr=162263

Type of change

Dependency upgrade
Bugfix (non-breaking change which fixes an issue)
New integration (thank you!)
New feature (which adds functionality to an existing integration)
Deprecation (breaking change to happen in the future)
Breaking change (fix/feature causing existing functionality to break)
Code quality improvements to existing code or addition of tests

Additional information

This PR fixes or closes issue: fixes #
This PR is related to issue:
Link to documentation pull request:
Link to developer documentation pull request:
Link to frontend pull request:

Checklist

I understand the code I am submitting and can explain how it works.
The code change is tested and works locally.
Local tests pass. Your PR cannot be merged unless tests pass
There is no commented out code in this PR.
I have followed the development checklist
I have followed the perfect PR recommendations
The code has been formatted using Ruff (ruff format homeassistant tests)
Tests have been added to verify that the new code works.
Any generated code has been carefully reviewed for correctness and compliance with project standards.

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated for www.home-assistant.io

If the code communicates with devices, web services, or third-party tools:

The manifest file has all fields filled out correctly.
Updated and included derived files by running: python3 -m script.hassfest.
New or updated dependencies have been added to requirements_all.txt.
Updated by running python3 -m script.gen_requirements_all.
For the updated dependencies a diff between library versions and ideally a link to the changelog/release notes is added to the PR description.

To help with the load of incoming pull requests:

I have reviewed two other open pull requests in this repository.

home-assistant · 2026-04-27T15:52:46Z

Hey there @bieniu, @thecode, @chemelli74, @bdraco, mind taking a look at this pull request as it has been labeled with an integration (shelly) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of shelly can trigger bot actions by commenting:

@home-assistant close Closes the pull request.
@home-assistant mark-draft Mark the pull request as draft.
@home-assistant ready-for-review Remove the draft status from the pull request.
@home-assistant rename Awesome new title Renames the pull request.
@home-assistant reopen Reopen the pull request.
@home-assistant unassign shelly Removes the current integration label and assignees on the pull request, add the integration domain after the command.
@home-assistant update-branch Update the pull request branch with the base branch.
@home-assistant add-label needs-more-information Add a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) to the pull request.
@home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component, problem in config, problem in device, feature-request) on the pull request.

epenet · 2026-04-27T15:56:16Z

-                and hasattr(entry, "runtime_data")
-                and isinstance(entry.runtime_data, ShellyEntryData)


I could not find ANY path in which the entry would be loaded without the runtime_data being present.

Copilot

Pull request overview

This PR removes defensive runtime_data checks in Shelly coordinator lookup helpers and drops tests that exercised missing runtime_data scenarios.

Changes:

Remove hasattr(entry, "runtime_data") / isinstance(..., ShellyEntryData) guards when resolving Shelly coordinators by device_id.
Remove tests that monkeypatched Shelly config entries to delete runtime_data.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File	Description
`homeassistant/components/shelly/coordinator.py`	Simplifies coordinator lookup by directly accessing `entry.runtime_data` when entries are loaded.
`tests/components/shelly/test_device_trigger.py`	Removes tests covering triggers when `runtime_data` is forcibly removed from the config entry.

Co-authored-by: Copilot <copilot@github.com>

epenet · 2026-04-27T16:02:03Z

-async def test_rpc_no_runtime_data(
-    hass: HomeAssistant,
-    device_registry: dr.DeviceRegistry,
-    service_calls: list[ServiceCall],
-    mock_rpc_device: Mock,
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    """Test the device trigger for the RPC device when there is no runtime_data in the entry."""


PR marked as draft to let code-owners describe why these tests were added...

thecode · 2026-04-27T18:44:54Z

I am worried that we recreate the bug it fixed if we remove it, see details at #118805

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

epenet · 2026-04-28T05:20:43Z

I am worried that we recreate the bug it fixed if we remove it, see details at #118805

I have read it now - but it doesn't explain how that is possible :( and I still don't understand how it can occur. I think it points to a bigger underlying issue.

Anyway, I have reverted the code changes and only updated the tests to clean up after themselves.

thecode · 2026-04-28T09:43:26Z

I don't understand why yet, but the changes in this PR remove 2 lines from the coverage
Before:

homeassistant/components/shelly/coordinator.py            443      0   100%

After:

homeassistant/components/shelly/coordinator.py            443      2    99%   210-211

Missing:

core/homeassistant/components/shelly/coordinator.py

Lines 210 to 211 in 6663717

    
           LOGGER.debug("Stopping RPC device coordinator for %s", self.name) 
        
           await self.shutdown()

We didn't have any specific test to cover it, but I am just wondering why this change remove the coverage for these lines.

epenet · 2026-04-28T09:48:15Z

I don't understand why yet, but the changes in this PR remove 2 lines from the coverage Before:
homeassistant/components/shelly/coordinator.py            443      0   100%
After:
homeassistant/components/shelly/coordinator.py            443      2    99%   210-211
Missing:

core/homeassistant/components/shelly/coordinator.py

Lines 210 to 211 in 6663717

LOGGER.debug("Stopping RPC device coordinator for %s", self.name)

await self.shutdown()

We didn't have any specific test to cover it, but I am just wondering why this change remove the coverage for these lines.

I wonder if maybe:

previously, the entry unloading failed silently => the device was unloaded via HA_STOP
now the entry unloading succeeds => the device doesn't need unloading via HA_STOP

thecode · 2026-04-28T10:49:09Z

previously, the entry unloading failed silently => the device was unloaded via HA_STOP

now the entry unloading succeeds => the device doesn't need unloading via HA_STOP

Since the changes in this PR make sense (and your explanation) lets proceed with it, I will look into adding another test to cover HA_STOP (so that is is not covered by mistake as it is now)

Remove invalid shelly runtime_data checks

7b927b2

Copilot AI review requested due to automatic review settings April 27, 2026 15:52

epenet requested review from bdraco, bieniu, chemelli74 and thecode as code owners April 27, 2026 15:52

home-assistant Bot assigned bieniu, thecode, chemelli74 and bdraco Apr 27, 2026

home-assistant Bot added the Quality Scale: platinum label Apr 27, 2026

Copilot started reviewing on behalf of epenet April 27, 2026 15:53 View session

epenet commented Apr 27, 2026

View reviewed changes

Copilot AI reviewed Apr 27, 2026

View reviewed changes

Comment thread homeassistant/components/shelly/coordinator.py

Comment thread homeassistant/components/shelly/coordinator.py

epenet marked this pull request as draft April 27, 2026 15:58

Add domain check

bc35908

Co-authored-by: Copilot <copilot@github.com>

epenet commented Apr 27, 2026

View reviewed changes

Adjust

616c28c

epenet changed the title ~~Remove invalid shelly runtime_data checks~~ Fix shelly device_trigger tests Apr 28, 2026

Copilot AI review requested due to automatic review settings April 28, 2026 04:57

epenet marked this pull request as ready for review April 28, 2026 04:57

Copilot AI reviewed Apr 28, 2026

View reviewed changes

Comment thread tests/components/shelly/test_device_trigger.py

Comment thread tests/components/shelly/test_device_trigger.py

epenet mentioned this pull request Apr 28, 2026

Fix shelly tests for Python 3.14.3 #166683

Closed

21 tasks

justanotherariel mentioned this pull request Apr 28, 2026

Bump base image to 2026.02.0 with Python 3.14.3, use 3.14.3 in CI #162263

Closed

71 tasks

thecode approved these changes Apr 28, 2026

View reviewed changes

home-assistant Bot added the code-owner-approved label Apr 28, 2026

thecode merged commit 7e2a7b9 into dev Apr 28, 2026
37 checks passed

thecode deleted the epenet/20260427-1751 branch April 28, 2026 10:50

github-actions Bot locked and limited conversation to collaborators Apr 29, 2026

		and hasattr(entry, "runtime_data")
		and isinstance(entry.runtime_data, ShellyEntryData)

Uh oh!

Conversation

epenet commented Apr 27, 2026

Proposed change

Type of change

Additional information

Checklist

Uh oh!

home-assistant Bot commented Apr 27, 2026

Uh oh!

epenet Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

epenet Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

thecode commented Apr 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

epenet commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thecode commented Apr 28, 2026

Uh oh!

epenet commented Apr 28, 2026

Uh oh!

thecode commented Apr 28, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

epenet commented Apr 28, 2026 •

edited

Loading