Skip to content

Fix shelly tests - bluetooth config flow#166850

Merged
justanotherariel merged 2 commits into
home-assistant:devfrom
justanotherariel:3.14.3-fix-shelly-bluetooth
Apr 21, 2026
Merged

Fix shelly tests - bluetooth config flow#166850
justanotherariel merged 2 commits into
home-assistant:devfrom
justanotherariel:3.14.3-fix-shelly-bluetooth

Conversation

@justanotherariel
Copy link
Copy Markdown
Member

@justanotherariel justanotherariel commented Mar 30, 2026

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.

  1. Added a new helper _async_inject_ble_discovery (line 62) which now patches the async_init function when calling inject_bluetooth_service_info_bleak which creates a flow otherwise. This is because most tests actually create their own flow manually with hass.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.
  2. Replaced most inject_bluetooth_service_info_bleak calls with _async_inject_ble_discovery.

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

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:

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:

Copilot AI review requested due to automatic review settings March 30, 2026 08:30
@home-assistant home-assistant Bot added cla-signed code-quality has-tests integration: shelly small-pr PRs with less than 30 lines. Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage Top 50 Integration is ranked within the top 50 by usage labels Mar 30, 2026
@home-assistant
Copy link
Copy Markdown
Contributor

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 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 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.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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_bleak calls 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.

Comment thread tests/components/shelly/test_config_flow.py
@bdraco
Copy link
Copy Markdown
Member

bdraco commented Apr 21, 2026

Cleaning out my review queue. Looks like there are conflicts.

@bdraco bdraco marked this pull request as draft April 21, 2026 07:04
@justanotherariel
Copy link
Copy Markdown
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.

@justanotherariel justanotherariel marked this pull request as ready for review April 21, 2026 08:11
Copilot AI review requested due to automatic review settings April 21, 2026 08:11
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

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

@justanotherariel justanotherariel merged commit 2a85046 into home-assistant:dev Apr 21, 2026
36 of 37 checks passed
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 22, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed code-owner-approved code-quality has-tests integration: shelly Quality Scale: platinum small-pr PRs with less than 30 lines. Top 50 Integration is ranked within the top 50 by usage Top 100 Integration is ranked within the top 100 by usage Top 200 Integration is ranked within the top 200 by usage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants