Fix shelly tests - bluetooth config flow#166850
Merged
justanotherariel merged 2 commits intoApr 21, 2026
Merged
Conversation
Contributor
|
Hey there @bieniu, @thecode, @chemelli74, @bdraco, mind taking a look at this pull request as it has been labeled with an integration ( Code owner commandsCode owners of
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR stabilizes Shelly’s Bluetooth-related config flow tests by preventing the Bluetooth manager from auto-starting competing discovery flows during test BLE advertisement injection.
Changes:
- Added a helper to inject BLE discovery data while suppressing config flow creation during the injection.
- Replaced many direct
inject_bluetooth_service_info_bleakcalls with the new helper to avoid duplicate/competing flows. - Switched several tests to use
create_mock_rpc_device()so required mock attributes/methods are consistently present.
This was referenced Mar 30, 2026
Member
|
Cleaning out my review queue. Looks like there are conflicts. |
Member
Author
|
Seems like #168380 already did some of the work that was in this PR. Fixed the merge conflict - should be less to review now. |
bdraco
approved these changes
Apr 21, 2026
chemelli74
approved these changes
Apr 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Breaking change
Proposed change
Split out from #166683 which tries to fix the flaky tests in the shelly integration. This PR focuses on the bluetooth related tests.
_async_inject_ble_discovery(line 62) which now patches theasync_initfunction when callinginject_bluetooth_service_info_bleakwhich creates a flow otherwise. This is because most tests actually create their own flow manually withhass.config_entries.flow.async_init(DOMAIN, source=BLUETOOTH)which then competes with the Bluetooth Manager's automically created flow. HA detects the duplicate unique ID and aborts one.inject_bluetooth_service_info_bleakcalls with_async_inject_ble_discovery.Type of change
Additional information
Checklist
ruff format homeassistant tests)If user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
Updated and included derived files by running:
python3 -m script.hassfest.requirements_all.txt.Updated by running
python3 -m script.gen_requirements_all.To help with the load of incoming pull requests: