Merge branch 'master' into remove_queued_preset_from_sdk

nivi-apple · Jul 22, 2024 · b8f3182 · b8f3182
2 parents eaf2973 + 27a653c
commit b8f3182
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt
@@ -128,7 +128,7 @@ mobly==1.12.1
     # via -r requirements.all.txt
 msgpack==1.0.4
     # via cachecontrol
-mypy==0.971
+mypy==1.10.1
     # via -r requirements.all.txt
 mypy-extensions==1.0.0
     # via mypy

diff --git a/scripts/setup/requirements.all.txt b/scripts/setup/requirements.all.txt
@@ -38,7 +38,7 @@ appdirs
 coloredlogs
 watchdog
 build==0.8.0
-mypy==0.971
+mypy==1.10.1
 mypy-protobuf==3.5.0
 protobuf==4.24.4
 types-protobuf==4.24.0.2
@@ -50,4 +50,3 @@ colorama
 
 # update tornado for pw_watch
 tornado
-
diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -81,7 +81,20 @@ tests:
                 value: maxScenesMinusOne / 2
 
     - label:
-          "Step 0a :TH sends KeySetWrite command in the GroupKeyManagement
+          "Step 0a :TH reads attribute {ServerList} from the Descriptor cluster
+          of the endpoint that implements the Scenes Management server on the
+          DUT. DUT responds with a list of server clusters containing the groups
+          cluster."
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [4]
+
+    - label:
+          "Step 0b :TH sends KeySetWrite command in the GroupKeyManagement
           cluster to DUT using a key that is pre-installed on the TH.
           GroupKeySet fields are as follows:"
       cluster: "Group Key Management"
@@ -103,7 +116,7 @@ tests:
                     }
 
     - label:
-          "Step 0b: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
+          "Step 0c: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
           0x01a1 in the GroupKeyMap attribute list on GroupKeyManagement cluster
           by writing the GroupKeyMap attribute with two entries as follows:"
       cluster: "Group Key Management"
@@ -117,7 +130,7 @@ tests:
                   { FabricIndex: 1, GroupId: G2, GroupKeySetID: 0x01a1 },
               ]
 
-    - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
+    - label: "Step 0d: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
       endpoint: endpoint