Skip to content

Commit f36e159

Browse files
cecilletcarmelveilleuxj-ororkejtrejoespinoza-gridkhodya
authored
1.4.2 cherry picks (#39842)
* TC-CC-2.1: Fix checks for nullable attributes (#39566) * TC-CC-2.1: Fix nullables Fixes the null check for StartUpColorTemperatureMireds, add null checks for other nullable values. * Update src/python_testing/TC_CC_2_1.py Co-authored-by: Tennessee Carmel-Veilleux <[email protected]> * number of primaries can also be null * minor fix to log --------- Co-authored-by: Tennessee Carmel-Veilleux <[email protected]> * [Fix] Fix CADMIN_1_19 test step 3 fabric filtered (#39609) - Changed to make test step 3 unfiltered now as mentioned in issue #(636)[project-chip/certification-tool#636] * TC-SC-4.3: Fix test for no TXT record returned from DUT (#39623) * TC-SC-4.3: Fix test for no TXT record The spec is a BIT fuzzy in this area, but in my re-reading, a TXT record is not specifically mandated, only certain keys in certain situations (which would then require a TXT record). If there are no mandatory TXT keys (which can happen for operational) then the TXT record can be omitted and that's fine. * Apply suggestions from code review * linter aka here's a deeply unimportant thing I'm going to waste your time on * TC-IDM-4.2: indicate the DUT needs to be commissioned (#39638) Side note - yes, I know how terrible this is. It's now written into the TH and will take a while to fix. We're working on it. * Revert matter_testing back to tag * Move app pipe and mark_all_remaining_steps_skipped back to master * Revert "Adding helper function for commands running errors (#38799)" This reverts commit 1bf9a3e. * some mypy conformance was added after sve * move opstate common back to the app pipe style on master * Put back changes for TestClusters on master * Take TBRM tests from master see https://github.com/project-chip/connectedhomeip/pull/39555/files * Rename from skip_all_remaining_steps_skipped to mark_all_remaining_steps_skipped (#38729) * Updated name from skip_all_remaining_steps_skipped to mark_all_remaining_steps_skipped. Updated test cases using the old name to new one. * fix: missing method name replace. * fix: updated test cases * Update step start to skip at src/python_testing/TC_CNET_4_3.py Co-authored-by: Andrey Khodyrev <[email protected]> * fix: updated docstring and method args type as the step method. * Added missing returns after marked as skip --------- Co-authored-by: Andrey Khodyrev <[email protected]> * Move all camera tests back up to master These weren't run through SVE anyway, won't be selected by the 1.4.2 PICS and this spec is enough is flux that there were changes to the cluster definitions between SVE and this branch that are affecting the test. * Proposal to remove --app-pid and --app-pipe-prefix for out of band commands. (#38778) * Updated linux apps to read the FIFO without using the app_pid. Now uses a value from a env variable or static value. This will be usefull on tests to use only -app_pipe <app_prefix>+ instead of two paramters. * Update write_to_app_pipe to only use app_pipe argument which is the full path to pipe file <prefix>_<id>, raises FileNotFound error if the pipe file is not found from start. Removed arguments app_pid and app_pipe_prefix as they are not needed anymore. * Removed arguments --app-pid and --app-pipe-prefix * Updated app-pipe_prefix to app-pipe with APP_ID in test cases * Updated OPSTATE testcases and OVENOPSTATE test cases to use --app-pippe with id instead of PID of the app. * Fix not found when the parameter is not available * Removed unused ci actions * Added APP_IDs for workflows. Currently those are static values for CI. * Remove automatically appended --app-pid on execution. Now it dependes on the CI parameters provided by the user. * Fix typo and restyle * Restyled by whitespace * Restyled by clang-format * fix: Solved typo for TC_RVCRUM_2_1. Added quotes for APP_ID. * fix: Fixed id for bridge app. Added --app-pipe for BRBINFO. Added missing app-pipe for TC_SWITCH * Typo in variable name * Typo RCV_CHIP * Missing file exists check when the app_pipe is send from the test case. * fix: code review fix, optimize for string. * Removed vars from yaml file * Removed APP_ID from Test case CI arguments from --app-pipe * Removed env variable for custom app-id. Replaced for app argument --app-id * Restyled by whitespace * Restore change. * fix: Fixed from comments, app_id set to empty string instead of nullptr, this will avoid uneeded check on each of the apps. * fix: removed comma * Added app-pipe from scripts args to app-args if present. This is to avoid having the fifo path in scripts args and app-args and avoid posible run errors. * Added custom fifo path for each one of the test cases. * Removed prefix. Updated app-id to app-pipe. Now app pipe gets the full path of the fifo path. If not defined avoid sChipNamedPipeCommands.Start() * Restyled by clang-format * Updated empty string compare * Added --app-pipe into app-args. Removed auto append --app-pipe this will need repeated value but will not force same fifo and allow more scenarios. * Updated tc_soil_2_2 with new fifo format. --------- Co-authored-by: Restyled.io <[email protected]> * add chime to do not run list Good grief why are you fighing me so hard, CI? Chime tests aren't even part of 1.4.2. If this continues, I'm going to delete the lot of you. --------- Co-authored-by: Tennessee Carmel-Veilleux <[email protected]> Co-authored-by: Jake Ororke <[email protected]> Co-authored-by: jtrejoespinoza-grid <[email protected]> Co-authored-by: Andrey Khodyrev <[email protected]> Co-authored-by: Restyled.io <[email protected]>
1 parent b89fa4c commit f36e159

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+946
-290
lines changed

.github/workflows/lint.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,6 @@ jobs:
325325
if: always()
326326
run: |
327327
ruff check
328-
329-
# Run ChipStackError linter
330-
- name: Check for errors using ruff Python linter
331-
if: always()
332-
run: |
333-
python3 scripts/check_chipstack.py
334328
335329
# git grep exits with 0 if it finds a match, but we want
336330
# to fail (exit nonzero) on match. And we want to exclude this file,

.github/workflows/mypy-validation.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ jobs:
5858
src/python_testing/matter_testing_infrastructure/chip/testing/tasks.py \
5959
src/python_testing/matter_testing_infrastructure/chip/testing/taglist_and_topology_test.py \
6060
src/python_testing/matter_testing_infrastructure/chip/testing/pics.py \
61-
src/python_testing/matter_testing_infrastructure/chip/testing/choice_conformance.py \
62-
src/python_testing/matter_testing_infrastructure/chip/testing/commissioning.py \
63-
src/python_testing/matter_testing_infrastructure/chip/testing/decorators.py \
6461
src/python_testing/matter_testing_infrastructure/chip/testing/basic_composition.py"
6562
6663
# Print a reminder about expanding coverage

scripts/check_chipstack.py

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/app/tests/suites/TestCluster.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3913,6 +3913,7 @@ tests:
39133913
23,
39143914
24,
39153915
25,
3916+
26,
39163917
4294049962,
39173918
]
39183919

src/app/tests/suites/certification/Test_TC_TBRM_2_2.yaml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ tests:
4141
values:
4242
- name: nodeId
4343
value: nodeId
44+
4445
# Step 1
4546
- label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
4647
command: readAttribute
@@ -49,25 +50,55 @@ tests:
4950
value: null
5051

5152
# Step 2
53+
- label: "TH send a GetActiveDatasetRequest command to the DUT"
54+
command: GetActiveDatasetRequest
55+
response:
56+
values:
57+
- name: Dataset
58+
value: ""
59+
60+
# Step 3
5261
- label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
5362
command: readAttribute
5463
attribute: PendingDatasetTimestamp
5564
response:
5665
value: null
5766

58-
# Step 3
67+
# Step 4
68+
- label: "TH send a GetPendingDatasetRequest command to the DUT"
69+
command: GetPendingDatasetRequest
70+
response:
71+
values:
72+
- name: Dataset
73+
value: ""
74+
75+
# Step 5
76+
# Note: Unsupported with darwin-framework-tool because it automatically performs a timed invoke
77+
- label:
78+
"TH sends a valid ActiveDatasetRequest command to the DUT without a
79+
timed interaction"
80+
command: SetActiveDatasetRequest
81+
arguments:
82+
values:
83+
- name: ActiveDataset
84+
value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
85+
response:
86+
error: NEEDS_TIMED_INTERACTION
87+
88+
# Step 6
5989
- label:
6090
"TH sends a valid ActiveDatasetRequest command to the DUT without
6191
having armed the fail-safe"
6292
command: SetActiveDatasetRequest
93+
timedInteractionTimeoutMs: 2000
6394
arguments:
6495
values:
6596
- name: ActiveDataset
6697
value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
6798
response:
6899
error: FAILSAFE_REQUIRED
69100

70-
# Step 4
101+
# Step 7
71102
- label: "TH sends ArmFailSafe command to the DUT"
72103
cluster: General Commissioning
73104
command: ArmFailSafe
@@ -83,38 +114,40 @@ tests:
83114
- name: ErrorCode
84115
value: CommissioningErrorEnum.OK
85116

86-
# Step 5
117+
# Step 8
87118
- label: "TH sends an invalid ActiveDatasetRequest command to the DUT"
88119
command: SetActiveDatasetRequest
120+
timedInteractionTimeoutMs: 2000
89121
arguments:
90122
values:
91123
- name: ActiveDataset
92124
value: PIXIT.TBRM.THREAD_INVALID_DATASET
93125
response:
94126
error: INVALID_COMMAND
95127

96-
# Step 6
128+
# Step 9
97129
- label: "TH sends a valid ActiveDatasetRequest command to the DUT"
98130
command: SetActiveDatasetRequest
131+
timedInteractionTimeoutMs: 2000
99132
arguments:
100133
values:
101134
- name: ActiveDataset
102135
value: PIXIT.TBRM.THREAD_ACTIVE_DATASET
103136

104-
# Step 7
137+
# Step 10
105138
- label: "TH sends CommissioningComplete command to the DUT"
106139
cluster: General Commissioning
107140
command: CommissioningComplete
108141
endpoint: 0
109142

110-
# Step 8
143+
# Step 11
111144
- label: "TH reads the InterfaceEnabled attribute from the DUT"
112145
command: readAttribute
113146
attribute: InterfaceEnabled
114147
response:
115148
value: true
116149

117-
# Step 9
150+
# Step 12
118151
- label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
119152
command: readAttribute
120153
attribute: ActiveDatasetTimestamp
@@ -123,7 +156,7 @@ tests:
123156
constraints:
124157
type: int64u
125158

126-
# Step 10
159+
# Step 13
127160
- label: "TH send a GetActiveDatasetRequest command to the DUT"
128161
command: GetActiveDatasetRequest
129162
response:

src/app/tests/suites/certification/Test_TC_TBRM_2_3.yaml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ tests:
4040
values:
4141
- name: nodeId
4242
value: nodeId
43+
4344
# Step 1
4445
- label: "TH reads the ActiveDatasetTimestamp attribute from the DUT"
4546
command: readAttribute
@@ -84,6 +85,7 @@ tests:
8485
- label: "TH sends a valid ActiveDatasetRequest command to the DUT"
8586
runIf: noActiveDataset
8687
command: SetActiveDatasetRequest
88+
timedInteractionTimeoutMs: 2000
8789
arguments:
8890
values:
8991
- name: ActiveDataset
@@ -106,14 +108,28 @@ tests:
106108
type: int64u
107109

108110
# Step 6
109-
- label: "TH sends a SetPendingDatasetRequest command to the DUT"
111+
# Note: Unsupported with darwin-framework-tool because it automatically performs a timed invoke
112+
- label:
113+
"TH sends a SetPendingDatasetRequest command to the DUT without a
114+
timed interaction"
110115
command: SetPendingDatasetRequest
111116
arguments:
112117
values:
113118
- name: PendingDataset
114119
value: PIXIT.TBRM.THREAD_PENDING_DATASET
120+
response:
121+
error: NEEDS_TIMED_INTERACTION
115122

116123
# Step 7
124+
- label: "TH sends a SetPendingDatasetRequest command to the DUT"
125+
command: SetPendingDatasetRequest
126+
timedInteractionTimeoutMs: 2000
127+
arguments:
128+
values:
129+
- name: PendingDataset
130+
value: PIXIT.TBRM.THREAD_PENDING_DATASET
131+
132+
# Step 8
117133
- label: "TH sends a GetPendingDatasetRequest command to the DUT"
118134
command: GetPendingDatasetRequest
119135
response:
@@ -123,7 +139,7 @@ tests:
123139
type: octet_string
124140
# TODO: This should be PIXIT.TBRM.THREAD_PENDING_DATASET but ignoring the Delay Timer element if present
125141

126-
# Step 8
142+
# Step 9
127143
- label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
128144
command: readAttribute
129145
attribute: PendingDatasetTimestamp
@@ -132,7 +148,7 @@ tests:
132148
type: int64u
133149
notValue: initialPendingTimestamp
134150

135-
# Step 9
151+
# Step 10
136152
- label:
137153
"TH subscribes to the ActiveDatasetTimestamp attribute from the DUT"
138154
command: subscribeAttribute
@@ -152,14 +168,14 @@ tests:
152168
constraints:
153169
hasValue: true
154170

155-
# Step 10
171+
# Step 11
156172
- label: "TH reads the PendingDatasetTimestamp attribute from the DUT"
157173
command: readAttribute
158174
attribute: PendingDatasetTimestamp
159175
response:
160176
value: null
161177

162-
# Step 11
178+
# Step 12
163179
- label: "TH sends a GetActiveDatasetRequest command to the DUT"
164180
command: GetActiveDatasetRequest
165181
response:
@@ -169,7 +185,7 @@ tests:
169185
constraints:
170186
type: octet_string
171187

172-
# Step 12
188+
# Step 13
173189
- label: "TH reads the InterfaceEnabled attribute from the DUT"
174190
command: readAttribute
175191
attribute: InterfaceEnabled

src/app/tests/suites/certification/Test_TC_TBRM_2_4.yaml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
# limitations under the License.
1414

1515
name:
16-
"[TC-TBRM-2.4] Verify that getting Active or Pending Dataset in the PASE
17-
session results in unsupported access"
16+
"[TC-TBRM-2.4] Verify that getting or setting Active or Pending Dataset in a
17+
PASE session results in unsupported access"
1818

1919
PICS:
2020
- TBRM.S
@@ -31,6 +31,7 @@ config:
3131
defaultValue: "hex:d0e8a02db8629e9d172dfd40719c89204ff395651a6a2612839a71469880ec2404687d05cf0642b91242c712b5405b6905070c2a4bd80bdc8437ae5a2aded0cf3de91318d16f0ce9450d1c802cc01f39b8761de87cc7eeeb7f52b51308353da49a"
3232

3333
tests:
34+
# Step 1
3435
- label: "Wait for the commissioned device to be retrieved"
3536
cluster: DelayCommands
3637
command: WaitForCommissionee
@@ -39,6 +40,7 @@ tests:
3940
- name: nodeId
4041
value: nodeId
4142

43+
# Step 2
4244
- label: "Open Commissioning Window"
4345
endpoint: 0
4446
cluster: Administrator Commissioning
@@ -57,6 +59,7 @@ tests:
5759
- name: Salt
5860
value: "SPAKE2P Key Salt"
5961

62+
# Step 3
6063
- label: "TH2 establishes a PASE session with the DUT"
6164
identity: beta
6265
cluster: CommissionerCommands
@@ -69,20 +72,51 @@ tests:
6972
- name: payload
7073
value: EcmPayload
7174

75+
# Step 4
7276
- label:
7377
"TH2 send GetActiveDatasetRequest command to the DUT in PASE session"
7478
identity: beta
7579
command: GetActiveDatasetRequest
7680
response:
7781
error: UNSUPPORTED_ACCESS
7882

83+
# Step 5
84+
- label:
85+
"TH2 send SetActiveDatasetRequest command to the DUT in PASE session"
86+
identity: beta
87+
command: SetActiveDatasetRequest
88+
timedInteractionTimeoutMs: 2000
89+
arguments:
90+
values:
91+
- name: ActiveDataset
92+
value: "hex:0e080000000000010000"
93+
response:
94+
error: UNSUPPORTED_ACCESS
95+
96+
# Step 6
7997
- label:
8098
"TH2 send GetPendingDatasetRequest command to the DUT in PASE session"
8199
identity: beta
82100
command: GetPendingDatasetRequest
83101
response:
84102
error: UNSUPPORTED_ACCESS
85103

104+
# Step 7
105+
- label:
106+
"TH sends a SetPendingDatasetRequest command to the DUT in PASE
107+
session"
108+
PICS: TBRM.S.F00
109+
identity: beta
110+
command: SetPendingDatasetRequest
111+
timedInteractionTimeoutMs: 2000
112+
arguments:
113+
values:
114+
- name: PendingDataset
115+
value: "hex:0e080000000000010000"
116+
response:
117+
error: UNSUPPORTED_ACCESS
118+
119+
# Step 8
86120
- label: "Cleanup: Close the commissioning window"
87121
endpoint: 0
88122
cluster: Administrator Commissioning

0 commit comments

Comments
 (0)