[SU] Add method that cancels subscriptions in integration tests #42298
+13
−7
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
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds subscription cancellation support to the integration testing infrastructure by implementing a cancel method for EventSubscriptionHandler and adding a configurable timeout parameter to the existing cancel method in AttributeSubscriptionHandler. This enables proper cleanup of subscriptions in Software Update (OTA) integration tests.
Key Changes:
- Added new
cancelmethod toEventSubscriptionHandlerclass for canceling event subscriptions - Made the timeout parameter configurable in
AttributeSubscriptionHandler.cancelmethod
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces a cancel method for EventSubscriptionHandler and updates the existing cancel method in AttributeSubscriptionHandler to allow parameterizing the timeout. This is a useful addition for integration tests.
My review focuses on an issue in the implementation of both cancel methods. They currently catch and swallow asyncio.CancelledError, which is generally incorrect for asyncio programming as it prevents tasks from being properly cancelled. I've suggested removing this exception handling to ensure correct cancellation behavior and also proposed updating the associated comments for clarity.
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
…g/event_attribute_reporting.py Co-authored-by: Copilot <[email protected]>
|
PR #42298: Size comparison from d85e161 to 26a97e8 Full report (8 builds for cc13x4_26x4, nrfconnect, realtek, stm32)
|
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
…g/event_attribute_reporting.py Co-authored-by: Copilot <[email protected]>
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Outdated
Show resolved
Hide resolved
…g/event_attribute_reporting.py Co-authored-by: Copilot <[email protected]>
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Show resolved
Hide resolved
src/python_testing/matter_testing_infrastructure/matter/testing/event_attribute_reporting.py
Show resolved
Hide resolved
|
PR #42298: Size comparison from d85e161 to 73edc2a Full report (35 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
|
PR #42298: Size comparison from d85e161 to 0991a7e Increases above 0.2%:
Full report (35 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, efr32, esp32, nrfconnect, nxp, psoc6, qpg, realtek, stm32, telink)
|
khodya
changed the title
khodya
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
This pull request introduces a
cancelmethod forEventSubscriptionHandlerand updates the existing cancel method inAttributeSubscriptionHandlerto allow parameterizing the timeout. This is a useful addition for integration tests.Catching and swallowing the
asyncio.CancelledErroris incorrect, thus, a test might continue working when it is supposed to be cancelled (for example, when exceeding the Mobly test timeout. This is the reason why the 200 seconds timeout was added to the TC_CADMIN_1_3 test.Related issues
Fixes project-chip/matter-test-scripts#735
Testing
Tested manually with TC_SC_2_2.py + REPL tests passing