Skip to content

Conversation

@puddly
Copy link
Contributor

@puddly puddly commented Dec 2, 2025

Proposed change

Zigpy now sets the TX power itself based on the passed through HA country. This PR fixes unit tests to use less mocks (which masked the issue) and reverts #155855, since it is no longer necessary.

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:

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 link to the changelog, or at minimum a diff between library versions is added to the PR description.

To help with the load of incoming pull requests:

@home-assistant
Copy link

home-assistant bot commented Dec 2, 2025

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (homeassistant_connect_zbt2) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of homeassistant_connect_zbt2 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 homeassistant_connect_zbt2 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) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@home-assistant
Copy link

home-assistant bot commented Dec 2, 2025

Hey there @home-assistant/core, mind taking a look at this pull request as it has been labeled with an integration (homeassistant_hardware) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of homeassistant_hardware 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 homeassistant_hardware 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) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@home-assistant
Copy link

home-assistant bot commented Dec 2, 2025

Hey there @dmulcahey, @Adminiuga, @TheJulianJES, mind taking a look at this pull request as it has been labeled with an integration (zha) you are listed as a code owner for? Thanks!

Code owner commands

Code owners of zha 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 zha 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) to the pull request.
  • @home-assistant remove-label needs-more-information Remove a label (needs-more-information, problem in dependency, problem in custom component) on the pull request.

@puddly puddly marked this pull request as ready for review December 2, 2025 19:38
Copilot AI review requested due to automatic review settings December 2, 2025 19:38
Copy link
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 fixes ZHA network formation by removing manual TX power configuration, as zigpy now handles TX power internally based on the Home Assistant country setting. It reverts PR #155855 which previously added TX power configuration logic.

Key changes:

  • Removed config parameter from async_form_network() method since TX power is now handled by zigpy
  • Eliminated TX power constants and country-to-power mapping from homeassistant_connect_zbt2
  • Improved test mocking to use create_autospec instead of generic AsyncMock for better type safety

Reviewed changes

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

Show a summary per file
File Description
tests/components/zha/test_config_flow.py Enhanced mock to use create_autospec(ControllerApplication) for more accurate testing
tests/components/homeassistant_connect_zbt2/test_config_flow.py Removed parametrized TX power tests and assertions
homeassistant/components/zha/radio_manager.py Removed config parameter from async_form_network() method
homeassistant/components/zha/config_flow.py Removed _extra_network_config instance variable and TX power handling logic
homeassistant/components/homeassistant_hardware/firmware_config_flow.py Removed _extra_zha_hardware_options() method that provided TX power
homeassistant/components/homeassistant_connect_zbt2/const.py Removed TX power constants and country mapping dictionary
homeassistant/components/homeassistant_connect_zbt2/config_flow.py Removed _extra_zha_hardware_options() override that calculated TX power from country

Copy link
Member

@TheJulianJES TheJulianJES left a comment

Choose a reason for hiding this comment

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

Nice! Looks good.

  • Tested new network formation with ZBT-2 and a third-party adapter: it works correctly again
  • Revert for the ZBT-2 integration specific TX power changes is also good, since the firmware that includes the country <> TX power mapping is already released as a stable version, so everyone will get that before setting up ZHA.
  • The test change is also a nice improvement.

@balloob balloob merged commit 2dd58db into home-assistant:dev Dec 2, 2025
126 of 128 checks passed
frenck pushed a commit that referenced this pull request Dec 2, 2025
@github-actions github-actions bot locked and limited conversation to collaborators Dec 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants