Skip to content

Use modern condition API in condition helper tests#169353

Merged
emontnemery merged 1 commit into
devfrom
condition_helper_tests_modern_api
Apr 28, 2026
Merged

Use modern condition API in condition helper tests#169353
emontnemery merged 1 commit into
devfrom
condition_helper_tests_modern_api

Conversation

@emontnemery
Copy link
Copy Markdown
Contributor

Proposed change

Use modern condition API in condition helper tests

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

Updates Home Assistant’s condition helper test suite to use the modern ConditionChecker API (async_check) while preserving coverage for legacy __call__ behavior.

Changes:

  • Replace legacy test(hass, ...) invocations with test.async_check(...) across condition helper tests.
  • Add/adjust tests to confirm __call__ forwarding behavior and AND semantics for async_conditions_from_config.
  • Update a comment to reflect “child checkers” terminology.

Comment on lines +460 to +483
async def test_conditions_from_config_forwards_call(
hass: HomeAssistant,
) -> None:
"""Test that async_conditions_from_config forwards call."""
hass.states.async_set("binary_sensor.test_one", STATE_ON)
hass.states.async_set("binary_sensor.test_two", STATE_ON)
configs = await condition.async_validate_conditions_config(
hass,
[
{
"condition": "state",
"entity_id": "binary_sensor.test_one",
"state": STATE_ON,
},
{
"condition": "state",
"entity_id": "binary_sensor.test_two",
"state": STATE_ON,
},
],
)
test = await condition.async_conditions_from_config(
hass, configs, logging.getLogger(__name__), "test"
)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This test looks unrelated.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

After modifying the test above, test_conditions_from_config_has_and_semantics there's no longer a direct call to the special checker returned by async_conditions_from_config, so adding this test closes that.

@emontnemery emontnemery merged commit 96bd991 into dev Apr 28, 2026
124 of 128 checks passed
@emontnemery emontnemery deleted the condition_helper_tests_modern_api branch April 28, 2026 11:04
@github-actions github-actions Bot locked and limited conversation to collaborators Apr 29, 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.

3 participants