Cherry Picking commits for 1.3TH (CCBs) #33758
Merged
+63
−39
Conversation
This file contains 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
* TC-SC-3.6: Add precondition to remove extra fabrics Before commissioning the other fabrics, remove pre-existing fabrics from the device because the TH does not have the ability to check for subscriptions from them. Note that this change means that any pre-exisiting fabrics on the device WILL NOT BE THERE after this test. This is the same behaviour as in RR-1.1. Test: Tested against all-clusters app. chip-tool pairing onnetwork-long 0x12344321 20202021 3840 chip-tool pairing open-commissioning-window 0x12344321 0 900 10000 3840 python src/python_testing/TC_SC_3_6.py --commissioning-method on-network \ --discriminator 3840 --passcode 20202021 Results (only relevant logs): [MatterTest] 05-17 07:54:32.981 INFO Pre-condition: Remove all pre-existing fabrics on the device that do not belong to the TH ... [MatterTest] 05-17 07:54:32.994 INFO Removing extra fabric at 1 from device. ... INFO:root:Final result: PASS ! * add missing import
* TC-RR-1.1: Fix for pre-existing fabric removal
This test assumed that the client ordering matched to the ordering
of the fabric table, but this is not the case if there is a fabric
on the device before the test starts. In this case, the initial
fabric is in table slot 1 with index 1, the test starts in table
slot 2, with fabric index 2. Then the initial fabric is removed
from table slot 1, and the test adds a new fabric. The new fabric
is allocated fabric index 3, but appears in slot 1 in the table,
and the order between the controllers and the fabric table as read
off the device is now out of sync.
Instead, name the controllers based on the fabric index rather
than the index in the fabric table.
TEST: commissioned all-clusters using chip-tool then ran RR-1.1.
Test now passes, whereas before there was a failure.
* Update src/python_testing/TC_RR_1_1.py
Co-authored-by: Andrei Litvin <[email protected]>
* Update src/python_testing/TC_RR_1_1.py
* Address review comments, fix
---------
Co-authored-by: Andrei Litvin <[email protected]>
* TC-OPCREDS-3.7: support DUTs with existing fabrics * Restyled by prettier-yaml --------- Co-authored-by: Restyled.io <[email protected]>
andy31415
approved these changes
Jun 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry Picking the following PRs for addressing these CCBs in TH v1.3
CCB-4059
CCB-4041
CCB-4060