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

Jump to bottom

[Scenes] Activated the automated yamls for scenes on CI #29714

Merged
merged 7 commits into from
Oct 14, 2023
Merged

[Scenes] Activated the automated yamls for scenes on CI #29714

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4aba195
Activated the automated yamls for scenes on CI
lpbeliveau-silabs Oct 5, 2023
28664a4
Added Scenes test to the darwin framework tool
lpbeliveau-silabs Oct 12, 2023
fadb9d3
Disabled test 2_2 for Repl as it used unsupported commands for this t…
lpbeliveau-silabs Oct 13, 2023
f7f38d1
Restyled by whitespace
restyled-commits Oct 13, 2023
f2572a3
Applied fix for Darwin build
lpbeliveau-silabs Oct 13, 2023
69d69ea
Regenerated Zap
lpbeliveau-silabs Oct 13, 2023
bac8b5f
Fixed name support typing for Darwin tests
lpbeliveau-silabs Oct 13, 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
1 change: 1 addition & 0 deletions 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 @@ -52,6 +52,7 @@
"Disabled because darwin-framework-tool does not support GetCommissionerRootCertificate",
"Test_AddNewFabricFromExistingFabric",
"Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster",
"Test_TC_S_2_2",
"Test_TC_TCCM_3_1",
"Test_TC_TCTL_2_1",
"Disabled because darwin-framework-tool does not support constraints arithmetic operations",
Expand Down
5 changes: 1 addition & 4 deletions scripts/tests/chiptest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ def _GetInDevelopmentTests() -> Set[str]:
# TestEventTriggersEnabled is true, which it's not in CI.
"Test_TC_SMOKECO_2_6.yaml", # chip-repl does not support local timeout (07/20/2023) and test assumes
# TestEventTriggersEnabled is true, which it's not in CI.
"Test_TC_S_2_4.yaml", # https://github.com/project-chip/connectedhomeip/issues/29117
}


Expand All @@ -176,9 +175,7 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
"Test_TC_ACE_1_6.yaml", # Test fails only in chip-repl: Refer--> https://github.com/project-chip/connectedhomeip/pull/27910#issuecomment-1632485584
"Test_TC_IDM_1_2.yaml", # chip-repl does not support AnyCommands (19/07/2023)
"TestGroupKeyManagementCluster.yaml", # chip-repl does not support EqualityCommands (2023-08-04)
"Test_TC_S_2_2.yaml", # chip-repl does not support scenes cluster commands
"Test_TC_S_2_3.yaml", # chip-repl does not support scenes cluster commands
"Test_TC_S_2_4.yaml", # chip-repl does not support scenes cluster commands
"Test_TC_S_2_2.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_MOD_3_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_MOD_3_2.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
"Test_TC_MOD_3_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster
Expand Down
25 changes: 11 additions & 14 deletions src/app/tests/suites/certification/Test_TC_S_2_2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ config:
cluster: "Scenes"
endpoint: 1
G1:
type: int16u
type: group_id
defaultValue: 0x0001
G2:
type: int16u
type: group_id
defaultValue: 0x0002

GroupKeyManagement.Endpoint: 0
Groups.Endpoint: 1

tests:
- label: "Wait for the commissioned device to be retrieved"
cluster: "DelayCommands"
Expand All @@ -54,7 +51,7 @@ tests:
"Step 0a: preparation step for using commands from Groups cluster: Add
KeySet"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetWrite"
arguments:
values:
Expand All @@ -75,7 +72,7 @@ tests:
"Step 0b: Preparation step for using commands from Groups cluster:
Write Group Keys"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "writeAttribute"
attribute: "GroupKeyMap"
arguments:
Expand All @@ -88,7 +85,7 @@ tests:
- label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
PICS: G.S.C04.Rsp
cluster: "Groups"
endpoint: Groups.Endpoint
endpoint: endpoint
command: "RemoveAllGroups"

- label:
Expand Down Expand Up @@ -330,7 +327,7 @@ tests:
- label: "Step 4a: Reboot target device"
PICS: PICS_SDK_CI_ONLY
cluster: "SystemCommands"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "Reboot"

- label: "Step 4a: Reboot target device(DUT)"
Expand Down Expand Up @@ -1033,7 +1030,7 @@ tests:
response:
values:
- name: "Status"
saveAs: StoreStatus
saveAs: StoredStatus
constraints:
anyOf: [0x00, 0x89]
- name: "GroupID"
Expand All @@ -1052,16 +1049,16 @@ tests:
- name: "Value1"
value: 0x00
- name: "Value2"
value: StoreStatus
value: StoredStatus
response:
- values:
- name: "Equals"
saveAs: ContinueTest
saveAs: ContinueStep14

- label:
"Step 14c: TH sends a GetSceneMembership command to DUT with the
GroupID field set to G2."
runIf: ContinueTest
runIf: ContinueStep14
PICS: S.S.C06.Rsp
command: "GetSceneMembership"
arguments:
Expand All @@ -1084,7 +1081,7 @@ tests:
KeySetRemove command to the GroupKeyManagement cluster with the
GroupKeySetID field set to 0x01a1"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetRemove"
arguments:
values:
Expand Down
11 changes: 5 additions & 6 deletions src/app/tests/suites/certification/Test_TC_S_2_3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ config:
cluster: "Scenes"
endpoint: 1
G1:
type: int16u
type: group_id
defaultValue: 0x0101
GroupKeyManagement.Endpoint: 0

tests:
- label: "Wait for the commissioned device to be retrieved"
Expand All @@ -49,7 +48,7 @@ tests:
"Step 0a: preparation step for using commands from Groups cluster: Add
KeySet"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetWrite"
arguments:
values:
Expand All @@ -70,7 +69,7 @@ tests:
"Step 0b: Preparation step for using commands from Groups cluster:
Write Group Keys"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "writeAttribute"
attribute: "GroupKeyMap"
arguments:
Expand All @@ -97,7 +96,7 @@ tests:

- label: "Install ACLs"
cluster: "Access Control"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "writeAttribute"
attribute: "ACL"
arguments:
Expand Down Expand Up @@ -644,7 +643,7 @@ tests:
KeySetRemove command to the GroupKeyManagement cluster with the
GroupKeySetID field set to 0x01a1"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetRemove"
arguments:
values:
Expand Down
12 changes: 4 additions & 8 deletions src/app/tests/suites/certification/Test_TC_S_2_4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ config:
nodeId: 0x12344321
cluster: "Scenes"
endpoint: 1

GroupKeyManagement.Endpoint: 0
G1:
type: int16u
type: group_id
defaultValue: 0x0001
Groups.Endpoint: 1

tests:
- label: "Wait for the commissioned device to be retrieved"
Expand All @@ -42,7 +39,7 @@ tests:
"Step 0a: preparation step for using commands from Groups cluster: Add
KeySet"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetWrite"
arguments:
values:
Expand All @@ -63,7 +60,7 @@ tests:
"Step 0b: Preparation step for using commands from Groups cluster:
Write Group Keys"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "writeAttribute"
attribute: "GroupKeyMap"
arguments:
Expand All @@ -72,7 +69,6 @@ tests:
- label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
PICS: G.S.C04.Rsp
cluster: "Groups"
endpoint: Groups.Endpoint
command: "RemoveAllGroups"

- label:
Expand Down Expand Up @@ -423,7 +419,7 @@ tests:
KeySetRemove command to the GroupKeyManagement cluster with the
GroupKeySetID field set to 0x01a1"
cluster: "Group Key Management"
endpoint: GroupKeyManagement.Endpoint
endpoint: 0
command: "KeySetRemove"
arguments:
values:
Expand Down
9 changes: 8 additions & 1 deletion src/app/tests/suites/ciTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,13 @@
"Test_TC_G_1_1",
"Test_TC_G_2_1"
],
"Scenes": ["Test_TC_S_1_1"],
"Scenes": [
"Test_TC_S_1_1",
"Test_TC_S_2_1",
"Test_TC_S_2_2",
"Test_TC_S_2_3",
"Test_TC_S_2_4"
],
"ResourceMonitoring": [
"TestActivatedCarbonFilterMonitoring",
"TestHepaFilterMonitoring",
Expand Down Expand Up @@ -413,6 +419,7 @@
"Subscriptions",
"DoorLock",
"Groups",
"Scenes",
"ResourceMonitoring"
]
}
7 changes: 1 addition & 6 deletions src/app/tests/suites/manualTests.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,7 @@
"TimeSynchronization": [],
"UnitLocalization": [],
"Binding": ["Test_TC_BIND_2_1", "Test_TC_BIND_2_2", "Test_TC_BIND_2_3"],
"Scenes": [
"Test_TC_S_1_1",
"Test_TC_S_2_1",
"Test_TC_S_2_5",
"Test_TC_S_2_6"
],
"Scenes": ["Test_TC_S_2_5", "Test_TC_S_2_6"],
"PumpConfigurationControl": [],
"AccessControl": [],
"UserLabel": [],
Expand Down
Loading
Loading