Skip to content

Conversation

@allenporter
Copy link
Contributor

This simplifies the shutdown logic relying on the device manager to close everything. This adds tests that the device manager is closed on unload and stop.

Breaking change

Rewrite the roborock shutdown code so that it register unload right after the device manager is created. the close method will close all the device local connections and the shared MQTT sessions. Add tests to cover both the unload and shutdown cases with a single function.

Proposed change

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 Roborock not closing MQTT Connection #158128
  • 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:

This simplifies the shutdown logic relying on the device manager to close everything. This adds tests that the device manager is closed on unload and stop.
@home-assistant
Copy link

home-assistant bot commented Dec 7, 2025

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

Code owner commands

Code owners of roborock 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 roborock 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.

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 simplifies the Roborock integration's shutdown logic by centralizing cleanup in the device manager's close() method, which handles both local device connections and shared MQTT sessions. Previously, the integration manually managed device closing and coordinator shutdown separately.

Key changes:

  • Centralized shutdown logic using device_manager.close() instead of individual device cleanup
  • Removed redundant coordinator shutdown code (coordinators auto-register cleanup via their base class)
  • Added comprehensive test coverage for both config entry unload and Home Assistant stop events

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
homeassistant/components/roborock/__init__.py Simplified shutdown by registering shutdown_roborock() to call device_manager.close() and cache.flush() on both unload and HA stop events; removed redundant per-device and per-coordinator cleanup code
tests/components/roborock/test_init.py Added two new tests verifying device manager closure on config entry unload and Home Assistant stop; added device_manager fixture parameter to test functions
tests/components/roborock/conftest.py Replaced custom FakeDeviceManager class with proper AsyncMock of DeviceManager; created dedicated device_manager fixture that properly mocks get_devices() and close() methods

Copy link
Contributor

@Lash-L Lash-L left a comment

Choose a reason for hiding this comment

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

Tested and confirmed working

@MS2620
Copy link

MS2620 commented Dec 7, 2025

Code seems to follow previous patterns and seems to simplify a lot of the previous code. Tests have passed. Good work.

@zweckj zweckj merged commit 2ac15ab into home-assistant:dev Dec 8, 2025
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Roborock not closing MQTT Connection

4 participants