Skip to content

Commit 52caffd

Browse files
manjunath-grlrestyled-commits
manjunath-grl
and
restyled-commits
authored
Fix script issues Sep 12 (#29179)
* Semi-automated --> Automated tests: TC-ACL-2.5 TC-ACL-2.6 TC-MEDIAPLAYBACK-6.3 Manual --> Automated: TC-TCCM-3.1 TC-TCCM-3.2 TC-TCTL-2.1 TC-TCTL-2.2 TC-TCTL-2.3 * Fixes issue: 634, 636, 637, 639, 640, 641, 642, 645, 646 Modified tests: TC_CADMIN_1_26 TC_DA_1_8 TC_DGGEN_2_1 TC_DGETH_2_1 TC_DGWIFI_3_2_Simulated TC_DISHALM_3_1 TC_DISHALM_3_2 TC_DISHALM_3_3 TC_DISHALM_3_4 TC_DISHALM_3_5 TC_DISHALM_3_6 TC_GRPKEY_2_1 TC_GRPKEY_2_2 TC_LTIME_3_1 TC_MOD_3_3 TC_MOD_3_4 TC_SC_4_2 TC_SC_4_3 TC_SC_4_4 TC_SC_4_6 TC_TCCM_3_2 TC_WNCV_3_1 TC_WNCV_3_2 * Fixes issue: 645, 643 Modified tests: TC-ACL-2.10 TC-GRPKEY-2.2 Manual tests: TC-BIND-2.1 TC-CNET-4.10 TC-MOD-1.3 TC-SWTCH-2.2 * Restyled by whitespace * Fixed the MOD-3.4 and TCTL-2.3 CI failures. * Fixed MOD-3.4 CI failure. * Fix Darwin failure for TCTL-2.3 * Modifed test as per comments: TC-DGETH-2.1 TC-DGGEN-2.1 TC-TCCM-3.1 TC-TCTL-2.1 TC-GRPKEY-2.1 * Restyled by prettier-yaml * Removed wait step as it is not in test-plan. * Fixes issue: #29182, #29183 * Fix issue: 647 * Fix CI failures for ACL-2.5, 2.6 testcases --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent f9d5fa7 commit 52caffd

Some content is hidden

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

44 files changed

+3149
-1582
lines changed

‎examples/darwin-framework-tool/templates/tests/ciTests.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
"Test_TC_PSCFG_2_1",
5151
"Test_TC_PSCFG_2_2",
5252
"Disabled because darwin-framework-tool does not support GetCommissionerRootCertificate",
53-
"Test_AddNewFabricFromExistingFabric"
53+
"Test_AddNewFabricFromExistingFabric",
54+
"Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster",
55+
"Test_TC_TCCM_3_1",
56+
"Test_TC_TCTL_2_1"
5457
]
5558
}

‎scripts/tests/chiptest/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,12 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
192192
"Test_TC_G_2_4.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
193193
"Test_TC_RVCRUNM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
194194
"Test_TC_RVCCLEANM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
195+
"Test_TC_TCCM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
196+
"Test_TC_TCTL_2_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
195197
# chip-repl and chip-tool disagree on what the YAML here should look like: https://github.com/project-chip/connectedhomeip/issues/29110
196198
"TestClusterMultiFabric.yaml",
199+
"Test_TC_ACL_2_5.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884
200+
"Test_TC_ACL_2_6.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884
197201
}
198202

199203

@@ -231,7 +235,7 @@ def target_for_name(name: str):
231235
return TestTarget.LOCK
232236
if name.startswith("OTA_"):
233237
return TestTarget.OTA
234-
if name.startswith("Test_TC_BRBINFO_"):
238+
if name.startswith("Test_TC_BRBINFO_") or name.startswith("Test_TC_ACT_"):
235239
return TestTarget.BRIDGE
236240
return TestTarget.ALL_CLUSTERS
237241

‎src/app/tests/suites/certification/PICS.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3660,7 +3660,7 @@ PICS:
36603660
id: GRPKEY.S.C01.Rsp
36613661

36623662
- label: "Does the device implement the KeySetReadResponse command}?"
3663-
id: GRPKEY.S.C02.Rsp
3663+
id: GRPKEY.S.C02.Tx
36643664

36653665
- label: "Does the device implement the KeySetRemove command}?"
36663666
id: GRPKEY.S.C03.Rsp
@@ -3670,7 +3670,7 @@ PICS:
36703670

36713671
- label:
36723672
"Does the device implement the KeySetReadAllIndicesResponse command}?"
3673-
id: GRPKEY.S.C05.Rsp
3673+
id: GRPKEY.S.C05.Tx
36743674

36753675
#
36763676
# client / attributes
@@ -7074,10 +7074,10 @@ PICS:
70747074
id: LTIME.S.A0002
70757075

70767076
- label: "Does the DUT (Server) support 12 Hr Hour Format ?"
7077-
id: LTIME.S.A0000.12HR
7077+
id: LTIME.S.M.12HR
70787078

70797079
- label: "Does the DUT (Server) support 24 Hr Hour Format ?"
7080-
id: LTIME.S.A0000.24HR
7080+
id: LTIME.S.M.24HR
70817081

70827082
#
70837083
# client / attributes

‎src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml

+16-4
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ tests:
9999

100100
#Issue https://github.com/project-chip/connectedhomeip/issues/26127
101101
- label:
102-
"TH1 puts DUT into commissioning mode, TH2 commissions DUT using admin
103-
node ID N2"
102+
"Step 3: TH1 puts DUT into commissioning mode, TH2 commissions DUT
103+
using admin node ID N2"
104104
verification: |
105105
Open a commissioning window On TH1(Chiptool)using below command
106106
@@ -128,7 +128,7 @@ tests:
128128
- name: "expectedValue"
129129
value: "y"
130130

131-
- label: "TH2 starts a commissioning process with DUT"
131+
- label: "Step 3: TH2 starts a commissioning process with DUT"
132132
PICS: PICS_SDK_CI_ONLY
133133
identity: "beta"
134134
cluster: "CommissionerCommands"
@@ -426,7 +426,6 @@ tests:
426426
value: "y"
427427

428428
- label: "TH1 Connects to the device again"
429-
PICS: PICS_SDK_CI_ONLY
430429
cluster: "DelayCommands"
431430
command: "WaitForCommissionee"
432431
arguments:
@@ -444,6 +443,19 @@ tests:
444443
- name: "nodeId"
445444
value: nodeId2
446445

446+
- label: "TH2 Connects to the device again after reboot."
447+
verification: |
448+
Connect TH2 to the device(DUT) again after reboot.
449+
cluster: "LogCommands"
450+
command: "UserPrompt"
451+
PICS: PICS_SKIP_SAMPLE_APP
452+
arguments:
453+
values:
454+
- name: "message"
455+
value: "Enter 'y' after success"
456+
- name: "expectedValue"
457+
value: "y"
458+
447459
- label:
448460
"Step 10:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
449461
PICS: ACL.S.A0000

‎src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml

+83-130
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ tests:
102102
PICS: ACL.S.E01
103103
command: "readEvent"
104104
event: "AccessControlExtensionChanged"
105+
eventNumber: "LastReceivedEventNumber + 1"
105106
response:
106107
value:
107108
{
@@ -126,52 +127,40 @@ tests:
126127
arguments:
127128
value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }]
128129

129-
#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
130130
- label:
131131
"Step 7: TH reads DUT Endpoint 0 AccessControl cluster
132132
AccessControlExtensionChanged event"
133-
verification: |
134-
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
135-
On TH1(Chiptool) , Verify AccessControlExtensionChanged containing at least 2 new elements.
136-
137-
[1661427357.681328][23441:23446] CHIP:TOO: }
138-
[1661427357.681520][23441:23446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
139-
[1661427357.681555][23441:23446] CHIP:TOO: Event number: 5
140-
[1661427357.681580][23441:23446] CHIP:TOO: Priority: Info
141-
[1661427357.681602][23441:23446] CHIP:TOO: Timestamp: 95095658
142-
[1661427357.681660][23441:23446] CHIP:TOO: AccessControlExtensionChanged: {
143-
[1661427357.681697][23441:23446] CHIP:TOO: AdminNodeID: 112233
144-
[1661427357.681730][23441:23446] CHIP:TOO: AdminPasscodeID: null
145-
[1661427357.681764][23441:23446] CHIP:TOO: ChangeType: 2
146-
[1661427357.681793][23441:23446] CHIP:TOO: LatestValue: {
147-
[1661427357.681826][23441:23446] CHIP:TOO: Data: 1718
148-
[1661427357.681854][23441:23446] CHIP:TOO: FabricIndex: 1
149-
[1661427357.681882][23441:23446] CHIP:TOO: }
150-
[1661427357.681924][23441:23446] CHIP:TOO: FabricIndex: 1
151-
[1661427357.681951][23441:23446] CHIP:TOO: }
152-
[1661427357.682163][23441:23446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
153-
[1661427357.682207][23441:23446] CHIP:TOO: Event number: 6
154-
[1661427357.682230][23441:23446] CHIP:TOO: Priority: Info
155-
[1661427357.682260][23441:23446] CHIP:TOO: Timestamp: 95095659
156-
[1661427357.682327][23441:23446] CHIP:TOO: AccessControlExtensionChanged: {
157-
[1661427357.682375][23441:23446] CHIP:TOO: AdminNodeID: 112233
158-
[1661427357.682405][23441:23446] CHIP:TOO: AdminPasscodeID: null
159-
[1661427357.682434][23441:23446] CHIP:TOO: ChangeType: 1
160-
[1661427357.682459][23441:23446] CHIP:TOO: LatestValue: {
161-
[1661427357.682495][23441:23446] CHIP:TOO: Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
162-
[1661427357.682524][23441:23446] CHIP:TOO: FabricIndex: 1
163-
[1661427357.682550][23441:23446] CHIP:TOO: }
164-
[1661427357.682579][23441:23446] CHIP:TOO: FabricIndex: 1
165-
[1661427357.682603][23441:23446] CHIP:TOO: }
166-
cluster: "LogCommands"
167-
command: "UserPrompt"
168-
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
169-
arguments:
170-
values:
171-
- name: "message"
172-
value: "Enter 'y' after success"
173-
- name: "expectedValue"
174-
value: "y"
133+
PICS: ACL.S.E01
134+
command: "readEvent"
135+
event: "AccessControlExtensionChanged"
136+
eventNumber: "LastReceivedEventNumber + 1"
137+
response:
138+
- values:
139+
- value:
140+
{
141+
AdminNodeID: CommissionerNodeId,
142+
AdminPasscodeID: null,
143+
ChangeType: 2,
144+
LatestValue:
145+
{
146+
Data: D_OK_EMPTY,
147+
FabricIndex: CurrentFabricIndexValue,
148+
},
149+
FabricIndex: CurrentFabricIndexValue,
150+
}
151+
- values:
152+
- value:
153+
{
154+
AdminNodeID: CommissionerNodeId,
155+
AdminPasscodeID: null,
156+
ChangeType: 1,
157+
LatestValue:
158+
{
159+
Data: D_OK_SINGLE,
160+
FabricIndex: CurrentFabricIndexValue,
161+
},
162+
FabricIndex: CurrentFabricIndexValue,
163+
}
175164

176165
- label:
177166
"Step 8: TH writes DUT Endpoint 0 AccessControl cluster Extension
@@ -185,37 +174,26 @@ tests:
185174
response:
186175
error: CONSTRAINT_ERROR
187176

188-
#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
189177
- label:
190178
"Step 9: TH reads DUT Endpoint 0 AccessControl cluster
191179
AccessControlExtensionChanged event"
192-
verification: |
193-
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
194-
195-
On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged containing at least 1 new element, and MUST NOT contain an added event for the extension with data that is too large
196-
197-
[1661427763.925039][23523:23528] CHIP:TOO: Event number: 7
198-
[1661427763.925054][23523:23528] CHIP:TOO: Priority: Info
199-
[1661427763.925067][23523:23528] CHIP:TOO: Timestamp: 95411825
200-
[1661427763.925095][23523:23528] CHIP:TOO: AccessControlExtensionChanged: {
201-
[1661427763.925112][23523:23528] CHIP:TOO: AdminNodeID: 112233
202-
[1661427763.925127][23523:23528] CHIP:TOO: AdminPasscodeID: null
203-
[1661427763.925142][23523:23528] CHIP:TOO: ChangeType: 2
204-
[1661427763.925156][23523:23528] CHIP:TOO: LatestValue: {
205-
[1661427763.925174][23523:23528] CHIP:TOO: Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
206-
[1661427763.925191][23523:23528] CHIP:TOO: FabricIndex: 1
207-
[1661427763.925205][23523:23528] CHIP:TOO: }
208-
[1661427763.925220][23523:23528] CHIP:TOO: FabricIndex: 1
209-
[1661427763.925234][23523:23528] CHIP:TOO: }
210-
cluster: "LogCommands"
211-
command: "UserPrompt"
212-
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
213-
arguments:
214-
values:
215-
- name: "message"
216-
value: "Enter 'y' after success"
217-
- name: "expectedValue"
218-
value: "y"
180+
PICS: ACL.S.E01
181+
command: "readEvent"
182+
event: "AccessControlExtensionChanged"
183+
eventNumber: "LastReceivedEventNumber + 1"
184+
response:
185+
value:
186+
{
187+
AdminNodeID: CommissionerNodeId,
188+
AdminPasscodeID: null,
189+
ChangeType: 2,
190+
LatestValue:
191+
{
192+
Data: D_OK_SINGLE,
193+
FabricIndex: CurrentFabricIndexValue,
194+
},
195+
FabricIndex: CurrentFabricIndexValue,
196+
}
219197

220198
- label:
221199
"Step 10: TH writes DUT Endpoint 0 AccessControl cluster Extension
@@ -233,38 +211,26 @@ tests:
233211
response:
234212
error: CONSTRAINT_ERROR
235213

236-
#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
237214
- label:
238215
"Step 11: TH reads DUT Endpoint 0 AccessControl cluster
239216
AccessControlExtensionChanged event"
240-
verification: |
241-
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
242-
On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event
243-
containing at least 1 new element, and MUST NOT contain an added event for the second extension
244-
[[1661428163.049647][23604:23609] CHIP:TOO: Event number: 8
245-
[1661428163.049660][23604:23609] CHIP:TOO: Priority: Info
246-
[1661428163.049673][23604:23609] CHIP:TOO: Timestamp: 95827304
247-
[1661428163.049698][23604:23609] CHIP:TOO: AccessControlExtensionChanged: {
248-
[1661428163.049714][23604:23609] CHIP:TOO: AdminNodeID: 112233
249-
[1661428163.049729][23604:23609] CHIP:TOO: AdminPasscodeID: null
250-
[1661428163.049744][23604:23609] CHIP:TOO: ChangeType: 1
251-
[1661428163.049758][23604:23609] CHIP:TOO: LatestValue: {
252-
[1661428163.049774][23604:23609] CHIP:TOO: Data: 1718
253-
[1661428163.049789][23604:23609] CHIP:TOO: FabricIndex: 1
254-
[1661428163.049803][23604:23609] CHIP:TOO: }
255-
[1661428163.049817][23604:23609] CHIP:TOO: FabricIndex: 1
256-
[1661428163.049831][23604:23609] CHIP:TOO: }
257-
[1661428163.050010][23604:23609] CHIP:EM: Sending Standalone Ack for MessageCounter:70117030 on exchange 55174i
258-
[1661428163.050065][23604:23609] CHIP:IN: Prepared secure message 0x7f2e7d092ff0 to 0x0000000000000001 (1) of type 0x10 and protocolId (0, 0) on exchange 55174i
259-
cluster: "LogCommands"
260-
command: "UserPrompt"
261-
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
262-
arguments:
263-
values:
264-
- name: "message"
265-
value: "Enter 'y' after success"
266-
- name: "expectedValue"
267-
value: "y"
217+
PICS: ACL.S.E01
218+
command: "readEvent"
219+
event: "AccessControlExtensionChanged"
220+
eventNumber: "LastReceivedEventNumber + 1"
221+
response:
222+
value:
223+
{
224+
AdminNodeID: CommissionerNodeId,
225+
AdminPasscodeID: null,
226+
ChangeType: 1,
227+
LatestValue:
228+
{
229+
Data: D_OK_EMPTY,
230+
FabricIndex: CurrentFabricIndexValue,
231+
},
232+
FabricIndex: CurrentFabricIndexValue,
233+
}
268234

269235
- label:
270236
"Step 12: TH writes DUT Endpoint 0 AccessControl cluster Extension
@@ -275,36 +241,23 @@ tests:
275241
arguments:
276242
value: []
277243

278-
#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
279244
- label:
280245
"Step 13: TH reads DUT Endpoint 0 AccessControl cluster
281246
AccessControlExtensionChanged event"
282-
verification: |
283-
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
284-
285-
On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event containing at least 1 new element
286-
287-
[1661428343.982081][23629:23634] CHIP:TOO: Event number: 9
288-
[1661428343.982087][23629:23634] CHIP:TOO: Priority: Info
289-
[1661428343.982092][23629:23634] CHIP:TOO: Timestamp: 96078599
290-
[1661428343.982103][23629:23634] CHIP:TOO: AccessControlExtensionChanged: {
291-
[1661428343.982109][23629:23634] CHIP:TOO: AdminNodeID: 112233
292-
[1661428343.982115][23629:23634] CHIP:TOO: AdminPasscodeID: null
293-
[1661428343.982121][23629:23634] CHIP:TOO: ChangeType: 2
294-
[1661428343.982127][23629:23634] CHIP:TOO: LatestValue: {
295-
[1661428343.982133][23629:23634] CHIP:TOO: Data: 1718
296-
[1661428343.982139][23629:23634] CHIP:TOO: FabricIndex: 1
297-
[1661428343.982145][23629:23634] CHIP:TOO: }
298-
[1661428343.982151][23629:23634] CHIP:TOO: FabricIndex: 1
299-
[1661428343.982157][23629:23634] CHIP:TOO: }
300-
[1661428343.982246][23629:23634] CHIP:EM: Sending Standalone Ack for MessageCounter:13864065 on exchange 38943i
301-
[1661428343.982272][23629:23634] CHIP:IN: Prepared secure message 0x7ff9a8e43ff0 to 0x0000000000000001 (1) of type 0x10 and
302-
cluster: "LogCommands"
303-
command: "UserPrompt"
304-
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
305-
arguments:
306-
values:
307-
- name: "message"
308-
value: "Enter 'y' after success"
309-
- name: "expectedValue"
310-
value: "y"
247+
PICS: ACL.S.E01
248+
command: "readEvent"
249+
event: "AccessControlExtensionChanged"
250+
eventNumber: "LastReceivedEventNumber + 1"
251+
response:
252+
value:
253+
{
254+
AdminNodeID: CommissionerNodeId,
255+
AdminPasscodeID: null,
256+
ChangeType: 2,
257+
LatestValue:
258+
{
259+
Data: D_OK_EMPTY,
260+
FabricIndex: CurrentFabricIndexValue,
261+
},
262+
FabricIndex: CurrentFabricIndexValue,
263+
}

0 commit comments

Comments
 (0)