Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix script issues Sep 12 #29179

Merged
merged 13 commits into from
Sep 14, 2023
Merged

Fix script issues Sep 12 #29179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fbde9bd
Semi-automated --> Automated tests:
manjunath-grl Sep 5, 2023
381f89c
Fixes issue:
manjunath-grl Sep 11, 2023
4d495a4
Fixes issue: 645, 643
manjunath-grl Sep 12, 2023
f2d059f
Restyled by whitespace
restyled-commits Sep 12, 2023
930e8c6
Fixed the MOD-3.4 and TCTL-2.3 CI failures.
manjunath-grl Sep 12, 2023
346dcec
Fixed MOD-3.4 CI failure.
manjunath-grl Sep 12, 2023
8236f32
Fix Darwin failure for TCTL-2.3
manjunath-grl Sep 12, 2023
d4bbeca
Modifed test as per comments:
manjunath-grl Sep 12, 2023
2498e56
Restyled by prettier-yaml
restyled-commits Sep 12, 2023
8eed453
Removed wait step as it is not in test-plan.
manjunath-grl Sep 12, 2023
fde53a8
Fixes issue: #29182, #29183
manjunath-grl Sep 13, 2023
5865b18
Fix issue: 647
manjunath-grl Sep 13, 2023
41fdbcf
Fix CI failures for ACL-2.5, 2.6 testcases
manjunath-grl Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion examples/darwin-framework-tool/templates/tests/ciTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
"Test_TC_PSCFG_2_1",
"Test_TC_PSCFG_2_2",
"Disabled because darwin-framework-tool does not support GetCommissionerRootCertificate",
"Test_AddNewFabricFromExistingFabric"
"Test_AddNewFabricFromExistingFabric",
"Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster",
"Test_TC_TCCM_3_1",
"Test_TC_TCTL_2_1"
]
}
6 changes: 5 additions & 1 deletion scripts/tests/chiptest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,12 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
"Test_TC_G_2_4.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_RVCRUNM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_RVCCLEANM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_TCCM_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_TCTL_2_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
# chip-repl and chip-tool disagree on what the YAML here should look like: https://github.com/project-chip/connectedhomeip/issues/29110
"TestClusterMultiFabric.yaml",
"Test_TC_ACL_2_5.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884
"Test_TC_ACL_2_6.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884
}


Expand Down Expand Up @@ -231,7 +235,7 @@ def target_for_name(name: str):
return TestTarget.LOCK
if name.startswith("OTA_"):
return TestTarget.OTA
if name.startswith("Test_TC_BRBINFO_"):
if name.startswith("Test_TC_BRBINFO_") or name.startswith("Test_TC_ACT_"):
return TestTarget.BRIDGE
return TestTarget.ALL_CLUSTERS

Expand Down
8 changes: 4 additions & 4 deletions src/app/tests/suites/certification/PICS.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3660,7 +3660,7 @@ PICS:
id: GRPKEY.S.C01.Rsp

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

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

- label:
"Does the device implement the KeySetReadAllIndicesResponse command}?"
id: GRPKEY.S.C05.Rsp
id: GRPKEY.S.C05.Tx

#
# client / attributes
Expand Down Expand Up @@ -7074,10 +7074,10 @@ PICS:
id: LTIME.S.A0002

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

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

#
# client / attributes
Expand Down
20 changes: 16 additions & 4 deletions src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ tests:

#Issue https://github.com/project-chip/connectedhomeip/issues/26127
- label:
"TH1 puts DUT into commissioning mode, TH2 commissions DUT using admin
node ID N2"
"Step 3: TH1 puts DUT into commissioning mode, TH2 commissions DUT
using admin node ID N2"
verification: |
Open a commissioning window On TH1(Chiptool)using below command

Expand Down Expand Up @@ -128,7 +128,7 @@ tests:
- name: "expectedValue"
value: "y"

- label: "TH2 starts a commissioning process with DUT"
- label: "Step 3: TH2 starts a commissioning process with DUT"
PICS: PICS_SDK_CI_ONLY
identity: "beta"
cluster: "CommissionerCommands"
Expand Down Expand Up @@ -426,7 +426,6 @@ tests:
value: "y"

- label: "TH1 Connects to the device again"
PICS: PICS_SDK_CI_ONLY
cluster: "DelayCommands"
command: "WaitForCommissionee"
arguments:
Expand All @@ -444,6 +443,19 @@ tests:
- name: "nodeId"
value: nodeId2

- label: "TH2 Connects to the device again after reboot."
verification: |
Connect TH2 to the device(DUT) again after reboot.
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP
arguments:
values:
- name: "message"
value: "Enter 'y' after success"
- name: "expectedValue"
value: "y"

- label:
"Step 10:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute"
PICS: ACL.S.A0000
Expand Down
213 changes: 83 additions & 130 deletions src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ tests:
PICS: ACL.S.E01
command: "readEvent"
event: "AccessControlExtensionChanged"
eventNumber: "LastReceivedEventNumber + 1"
response:
value:
{
Expand All @@ -126,52 +127,40 @@ tests:
arguments:
value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }]

#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
- label:
"Step 7: TH reads DUT Endpoint 0 AccessControl cluster
AccessControlExtensionChanged event"
verification: |
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
On TH1(Chiptool) , Verify AccessControlExtensionChanged containing at least 2 new elements.

[1661427357.681328][23441:23446] CHIP:TOO: }
[1661427357.681520][23441:23446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
[1661427357.681555][23441:23446] CHIP:TOO: Event number: 5
[1661427357.681580][23441:23446] CHIP:TOO: Priority: Info
[1661427357.681602][23441:23446] CHIP:TOO: Timestamp: 95095658
[1661427357.681660][23441:23446] CHIP:TOO: AccessControlExtensionChanged: {
[1661427357.681697][23441:23446] CHIP:TOO: AdminNodeID: 112233
[1661427357.681730][23441:23446] CHIP:TOO: AdminPasscodeID: null
[1661427357.681764][23441:23446] CHIP:TOO: ChangeType: 2
[1661427357.681793][23441:23446] CHIP:TOO: LatestValue: {
[1661427357.681826][23441:23446] CHIP:TOO: Data: 1718
[1661427357.681854][23441:23446] CHIP:TOO: FabricIndex: 1
[1661427357.681882][23441:23446] CHIP:TOO: }
[1661427357.681924][23441:23446] CHIP:TOO: FabricIndex: 1
[1661427357.681951][23441:23446] CHIP:TOO: }
[1661427357.682163][23441:23446] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Event 0x0000_0001
[1661427357.682207][23441:23446] CHIP:TOO: Event number: 6
[1661427357.682230][23441:23446] CHIP:TOO: Priority: Info
[1661427357.682260][23441:23446] CHIP:TOO: Timestamp: 95095659
[1661427357.682327][23441:23446] CHIP:TOO: AccessControlExtensionChanged: {
[1661427357.682375][23441:23446] CHIP:TOO: AdminNodeID: 112233
[1661427357.682405][23441:23446] CHIP:TOO: AdminPasscodeID: null
[1661427357.682434][23441:23446] CHIP:TOO: ChangeType: 1
[1661427357.682459][23441:23446] CHIP:TOO: LatestValue: {
[1661427357.682495][23441:23446] CHIP:TOO: Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
[1661427357.682524][23441:23446] CHIP:TOO: FabricIndex: 1
[1661427357.682550][23441:23446] CHIP:TOO: }
[1661427357.682579][23441:23446] CHIP:TOO: FabricIndex: 1
[1661427357.682603][23441:23446] CHIP:TOO: }
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
arguments:
values:
- name: "message"
value: "Enter 'y' after success"
- name: "expectedValue"
value: "y"
PICS: ACL.S.E01
command: "readEvent"
event: "AccessControlExtensionChanged"
eventNumber: "LastReceivedEventNumber + 1"
response:
- values:
- value:
{
AdminNodeID: CommissionerNodeId,
AdminPasscodeID: null,
ChangeType: 2,
LatestValue:
{
Data: D_OK_EMPTY,
FabricIndex: CurrentFabricIndexValue,
},
FabricIndex: CurrentFabricIndexValue,
}
- values:
- value:
{
AdminNodeID: CommissionerNodeId,
AdminPasscodeID: null,
ChangeType: 1,
LatestValue:
{
Data: D_OK_SINGLE,
FabricIndex: CurrentFabricIndexValue,
},
FabricIndex: CurrentFabricIndexValue,
}

- label:
"Step 8: TH writes DUT Endpoint 0 AccessControl cluster Extension
Expand All @@ -185,37 +174,26 @@ tests:
response:
error: CONSTRAINT_ERROR

#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
- label:
"Step 9: TH reads DUT Endpoint 0 AccessControl cluster
AccessControlExtensionChanged event"
verification: |
./chip-tool accesscontrol read-event access-control-extension-changed 1 0

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

[1661427763.925039][23523:23528] CHIP:TOO: Event number: 7
[1661427763.925054][23523:23528] CHIP:TOO: Priority: Info
[1661427763.925067][23523:23528] CHIP:TOO: Timestamp: 95411825
[1661427763.925095][23523:23528] CHIP:TOO: AccessControlExtensionChanged: {
[1661427763.925112][23523:23528] CHIP:TOO: AdminNodeID: 112233
[1661427763.925127][23523:23528] CHIP:TOO: AdminPasscodeID: null
[1661427763.925142][23523:23528] CHIP:TOO: ChangeType: 2
[1661427763.925156][23523:23528] CHIP:TOO: LatestValue: {
[1661427763.925174][23523:23528] CHIP:TOO: Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
[1661427763.925191][23523:23528] CHIP:TOO: FabricIndex: 1
[1661427763.925205][23523:23528] CHIP:TOO: }
[1661427763.925220][23523:23528] CHIP:TOO: FabricIndex: 1
[1661427763.925234][23523:23528] CHIP:TOO: }
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
arguments:
values:
- name: "message"
value: "Enter 'y' after success"
- name: "expectedValue"
value: "y"
PICS: ACL.S.E01
command: "readEvent"
event: "AccessControlExtensionChanged"
eventNumber: "LastReceivedEventNumber + 1"
response:
value:
{
AdminNodeID: CommissionerNodeId,
AdminPasscodeID: null,
ChangeType: 2,
LatestValue:
{
Data: D_OK_SINGLE,
FabricIndex: CurrentFabricIndexValue,
},
FabricIndex: CurrentFabricIndexValue,
}

- label:
"Step 10: TH writes DUT Endpoint 0 AccessControl cluster Extension
Expand All @@ -233,38 +211,26 @@ tests:
response:
error: CONSTRAINT_ERROR

#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
- label:
"Step 11: TH reads DUT Endpoint 0 AccessControl cluster
AccessControlExtensionChanged event"
verification: |
./chip-tool accesscontrol read-event access-control-extension-changed 1 0
On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event
containing at least 1 new element, and MUST NOT contain an added event for the second extension
[[1661428163.049647][23604:23609] CHIP:TOO: Event number: 8
[1661428163.049660][23604:23609] CHIP:TOO: Priority: Info
[1661428163.049673][23604:23609] CHIP:TOO: Timestamp: 95827304
[1661428163.049698][23604:23609] CHIP:TOO: AccessControlExtensionChanged: {
[1661428163.049714][23604:23609] CHIP:TOO: AdminNodeID: 112233
[1661428163.049729][23604:23609] CHIP:TOO: AdminPasscodeID: null
[1661428163.049744][23604:23609] CHIP:TOO: ChangeType: 1
[1661428163.049758][23604:23609] CHIP:TOO: LatestValue: {
[1661428163.049774][23604:23609] CHIP:TOO: Data: 1718
[1661428163.049789][23604:23609] CHIP:TOO: FabricIndex: 1
[1661428163.049803][23604:23609] CHIP:TOO: }
[1661428163.049817][23604:23609] CHIP:TOO: FabricIndex: 1
[1661428163.049831][23604:23609] CHIP:TOO: }
[1661428163.050010][23604:23609] CHIP:EM: Sending Standalone Ack for MessageCounter:70117030 on exchange 55174i
[1661428163.050065][23604:23609] CHIP:IN: Prepared secure message 0x7f2e7d092ff0 to 0x0000000000000001 (1) of type 0x10 and protocolId (0, 0) on exchange 55174i
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
arguments:
values:
- name: "message"
value: "Enter 'y' after success"
- name: "expectedValue"
value: "y"
PICS: ACL.S.E01
command: "readEvent"
event: "AccessControlExtensionChanged"
eventNumber: "LastReceivedEventNumber + 1"
response:
value:
{
AdminNodeID: CommissionerNodeId,
AdminPasscodeID: null,
ChangeType: 1,
LatestValue:
{
Data: D_OK_EMPTY,
FabricIndex: CurrentFabricIndexValue,
},
FabricIndex: CurrentFabricIndexValue,
}

- label:
"Step 12: TH writes DUT Endpoint 0 AccessControl cluster Extension
Expand All @@ -275,36 +241,23 @@ tests:
arguments:
value: []

#Issue: https://github.com/project-chip/connectedhomeip/issues/24149
- label:
"Step 13: TH reads DUT Endpoint 0 AccessControl cluster
AccessControlExtensionChanged event"
verification: |
./chip-tool accesscontrol read-event access-control-extension-changed 1 0

On TH1(Chiptool) , Verify AccessControl cluster AccessControlExtensionChanged event containing at least 1 new element

[1661428343.982081][23629:23634] CHIP:TOO: Event number: 9
[1661428343.982087][23629:23634] CHIP:TOO: Priority: Info
[1661428343.982092][23629:23634] CHIP:TOO: Timestamp: 96078599
[1661428343.982103][23629:23634] CHIP:TOO: AccessControlExtensionChanged: {
[1661428343.982109][23629:23634] CHIP:TOO: AdminNodeID: 112233
[1661428343.982115][23629:23634] CHIP:TOO: AdminPasscodeID: null
[1661428343.982121][23629:23634] CHIP:TOO: ChangeType: 2
[1661428343.982127][23629:23634] CHIP:TOO: LatestValue: {
[1661428343.982133][23629:23634] CHIP:TOO: Data: 1718
[1661428343.982139][23629:23634] CHIP:TOO: FabricIndex: 1
[1661428343.982145][23629:23634] CHIP:TOO: }
[1661428343.982151][23629:23634] CHIP:TOO: FabricIndex: 1
[1661428343.982157][23629:23634] CHIP:TOO: }
[1661428343.982246][23629:23634] CHIP:EM: Sending Standalone Ack for MessageCounter:13864065 on exchange 38943i
[1661428343.982272][23629:23634] CHIP:IN: Prepared secure message 0x7ff9a8e43ff0 to 0x0000000000000001 (1) of type 0x10 and
cluster: "LogCommands"
command: "UserPrompt"
PICS: PICS_SKIP_SAMPLE_APP && ACL.S.E01
arguments:
values:
- name: "message"
value: "Enter 'y' after success"
- name: "expectedValue"
value: "y"
PICS: ACL.S.E01
command: "readEvent"
event: "AccessControlExtensionChanged"
eventNumber: "LastReceivedEventNumber + 1"
response:
value:
{
AdminNodeID: CommissionerNodeId,
AdminPasscodeID: null,
ChangeType: 2,
LatestValue:
{
Data: D_OK_EMPTY,
FabricIndex: CurrentFabricIndexValue,
},
FabricIndex: CurrentFabricIndexValue,
}
Loading