Skip to content

Use fixtures for all entity IDs in Evohome tests#167479

Merged
MartinHjelmare merged 5 commits into
home-assistant:devfrom
zxdavb:evo_tidy_up_2
Apr 6, 2026
Merged

Use fixtures for all entity IDs in Evohome tests#167479
MartinHjelmare merged 5 commits into
home-assistant:devfrom
zxdavb:evo_tidy_up_2

Conversation

@zxdavb
Copy link
Copy Markdown
Member

@zxdavb zxdavb commented Apr 5, 2026

Proposed change

SSIA.

This prepares Evohome for upcoming changes where it may be possible to have more than one HotWater entity.

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

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 updates Evohome tests to stop relying on hard-coded entity IDs and instead resolve entity IDs from the entity registry via fixtures, making the suite resilient to entity_id naming changes in the integration.

Changes:

  • Replace the hard-coded DHW water heater entity_id in water heater tests with a dhw_id fixture.
  • Add an entity_id helper fixture (platform + unique_id → entity_id) and refactor ctl_id/zone_id to use unique_id-based lookups.

Reviewed changes

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

File Description
tests/components/evohome/test_water_heater.py Switch DHW service calls to use the new dhw_id fixture instead of a constant entity_id.
tests/components/evohome/conftest.py Introduce entity_id/dhw_id fixtures and refactor ctl_id/zone_id to resolve entity_ids via the entity registry and unique_ids.

@zxdavb zxdavb marked this pull request as draft April 6, 2026 08:48
@zxdavb zxdavb marked this pull request as ready for review April 6, 2026 08:48
Copilot AI review requested due to automatic review settings April 6, 2026 08:48
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 2 out of 2 changed files in this pull request and generated no new comments.

Comment thread tests/components/evohome/conftest.py Outdated
Copilot AI review requested due to automatic review settings April 6, 2026 10:02
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 2 out of 2 changed files in this pull request and generated 1 comment.

Comment thread tests/components/evohome/conftest.py Outdated
Comment thread tests/components/evohome/conftest.py Outdated
@MartinHjelmare MartinHjelmare marked this pull request as draft April 6, 2026 16:55
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings April 6, 2026 21:09
Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
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 2 out of 2 changed files in this pull request and generated no new comments.

@zxdavb zxdavb marked this pull request as ready for review April 6, 2026 21:54
Copilot AI review requested due to automatic review settings April 6, 2026 21:55
Copy link
Copy Markdown
Member

@MartinHjelmare MartinHjelmare left a comment

Choose a reason for hiding this comment

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

Thanks!

@MartinHjelmare MartinHjelmare merged commit 298b9b9 into home-assistant:dev Apr 6, 2026
36 checks passed
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 2 out of 2 changed files in this pull request and generated no new comments.

@zxdavb zxdavb deleted the evo_tidy_up_2 branch April 6, 2026 22:17
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 7, 2026
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.

4 participants