Fix a bug in rainbird device migration that results in additional devices #149078
Conversation
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
|
Hey there @konikvranik, mind taking a look at this pull request as it has been labeled with an integration ( Code owner commandsCode owners of
|
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in the rainbird device migration logic that creates duplicate devices when the serial number is zero and the MAC address has a leading zero. The fix prevents migration when device IDs are already in the correct format by checking if the unique_id starts with the MAC address before attempting migration.
Key changes:
- Adds a check to skip migration if the device ID already uses the MAC address format
- Includes a comprehensive test case that reproduces the issue with a serial number of "0" and a MAC address starting with "01"
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
homeassistant/components/rainbird/__init__.py |
Adds logic to skip migration when device ID is already in correct MAC address format |
tests/components/rainbird/test_init.py |
Adds test case to verify fix for duplicate device creation during reload with zero serial number |
Comments suppressed due to low confidence (1)
tests/components/rainbird/test_init.py:454
- The test function name 'test_reload_migration_with_leading_zero_mac' is misleading. The test is actually about preventing duplicate devices when serial number is zero, not specifically about leading zeros in MAC addresses. Consider renaming to 'test_migration_prevents_duplicates_with_zero_serial' or similar.
async def test_reload_migration_with_leading_zero_mac(
zweckj
approved these changes
Jul 19, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Proposed change
Fix a bug in rainbird device migration that results in additional devices when the serial number is zero. The new check prevents migration when the device id is already in the correct format. Adds a test that was able to reproduce the issue before fixing.
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: