Modified scripts Feb 15 (#25076)

* Fixes issue 493, 496, 701, 693 Modified tests TC_ACE_1_5 TC_ACL_2_10.yaml TC_ACL_2_7 TC_ACL_2_8 TC_ACT_3_1_Simulated TC_BINFO_2_3_Simulated TC_BOOL_3_1_Simulated TC_CADMIN_1_10 TC_CADMIN_1_11 TC_CADMIN_1_13 TC_CADMIN_1_15 TC_CADMIN_1_16 TC_CADMIN_1_3 TC_CADMIN_1_4 TC_CADMIN_1_5 TC_CADMIN_1_6 TC_CADMIN_1_9 TC_CC_3_1 TC_DESC_2_2_Simulated TC_DGETH_3_1_Simulated TC_DGSW_3_1_Simulated TC_DGWIFI_3_1_Simulated TC_FLABEL_3_1_Simulated TC_FLW_3_1_Simulated TC_G_3_1_Simulated TC_I_3_1_Simulated TC_LCFG_3_1_Simulated TC_LTIME_1_1_Simulated TC_LUNIT_1_1_Simulated TC_LUNIT_2_1_Simulated TC_OCC_2_2_Simulated TC_OCC_2_4_Simulated TC_PRS_3_1_Simulated TC_PSCFG_3_1_Simulated TC_PS_3_1_Simulated TC_RH_3_1_Simulated TC_SWTCH_3_1_Simulated TC_ULABEL_3_1_Simulated TC_WNCV_5_1_Simulated Python script: TC-CGEN-2.4 * Auto generated files * Auto generated files * Removed simulated test Commission step * Auto generated files * Modified Manual scripts * Restyled by whitespace --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Mar 2, 2023 · 878e826 · 878e826
1 parent 7c4c4d9
commit 878e826
Show file tree

Hide file tree

Showing 81 changed files with 4,365 additions and 4,579 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
@@ -25,6 +25,9 @@ config:
     discriminator:
         type: int16u
         defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
     PakeVerifier:
         type: octet_string
         defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
@@ -62,6 +65,14 @@ tests:
               - name: "Salt"
                 value: "SPAKE2P Key Salt"
 
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
     - label: "Commission from TH2"
       identity: "beta"
       cluster: "CommissionerCommands"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
@@ -28,6 +28,9 @@ config:
     discriminator:
         type: int16u
         defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00"
@@ -84,6 +87,14 @@ tests:
               - name: "Salt"
                 value: "SPAKE2P Key Salt"
 
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
     - label: "TH2 starts a commissioning process with DUT"
       identity: "beta"
       cluster: "CommissionerCommands"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
@@ -31,6 +31,9 @@ config:
     discriminator:
         type: int16u
         defaultValue: 3840
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
     PakeVerifier:
         type: octet_string
         defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
@@ -84,6 +87,14 @@ tests:
               - name: "Salt"
                 value: "SPAKE2P Key Salt"
 
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
     - label: "Step 4:TH2 starts a commissioning process with DUT"
       identity: "beta"
       cluster: "CommissionerCommands"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml
@@ -24,6 +24,9 @@ config:
     nodeId2:
         type: node_id
         defaultValue: 0xCAFE
+    waitAfterCommissioning:
+        type: int16u
+        defaultValue: 5000
     payload:
         type: char_string
         defaultValue: "MT:-24J0AFN00KA0648G00"
@@ -76,6 +79,14 @@ tests:
               - name: "Salt"
                 value: "SPAKE2P Key Salt"
 
+    - label: "Waiting after opening commissioning window"
+      cluster: "DelayCommands"
+      command: "WaitForMs"
+      arguments:
+          values:
+              - name: "ms"
+                value: waitAfterCommissioning
+
     - label: "TH2 starts a commissioning process with DUT"
       identity: "beta"
       cluster: "CommissionerCommands"

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_1_Simulated.yaml
@@ -27,9 +27,9 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Wait for the device to be commissioned"
-      cluster: "DelayCommands"
-      command: "WaitForCommissioning"
+    #- label: "Wait for the device to be commissioned"
+    #  cluster: "DelayCommands"
+    #  command: "WaitForCommissioning"
 
     - label: "Read attribute: ActionList"
       wait: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
@@ -32,7 +32,7 @@ tests:
 
           3. BINFO.S.A0011(Reachable) - TH reads Reachable attribute from DUT and saves for future use(should be true)
 
-          4. BINFO.S.E00(StartUp) | BINFO.S.E01(ShutDown) && BINFO.S.E02(Leave) - TH subscribes to StartUp, ShutDown, Leave and ReachableChanged events on the Basic Information cluster of the DUT
+          4. BINFO.S.E00(StartUp) | BINFO.S.E01(ShutDown) || BINFO.S.E02(Leave) - TH subscribes to StartUp, ShutDown, Leave and ReachableChanged events on the Basic Information cluster of the DUT
 
           5. TH saves the FabricIndex during commissioning
       disabled: true
@@ -45,7 +45,7 @@ tests:
 
           ./chip-tool  basicinformation read-event start-up 1 0
 
-          verify that StartUp event as priority set has CRITICAL and software verision on TH(chip-tool)
+          Verify that StartUp event priority is set is to CRITICAL and software verision is 1 on TH(chip-tool)
 
           [1657193007.841105][5422:5427] CHIP:DMG:         ],
           [1657193007.841137][5422:5427] CHIP:DMG:
@@ -65,7 +65,7 @@ tests:
     - label: "TH subscribes to the ShutDown event on the DUT. Shutdown DUT."
       PICS: BINFO.S.E01
       verification: |
-          To verify leave event follow the below commands , Pls use equivalent command on the respective DUT
+          To verify ShutDown event follow the below commands , Pls use equivalent command on the respective DUT
 
 
           1. Launch chip-tool into interactive mode with the command

diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_3_Simulated.yaml
@@ -23,9 +23,9 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Wait for the device to be commissioned"
-      cluster: "DelayCommands"
-      command: "WaitForCommissioning"
+    #- label: "Wait for the device to be commissioned"
+    #  cluster: "DelayCommands"
+    #  command: "WaitForCommissioning"
 
     - label: "Log OnOff Test Startup"
       cluster: "LogCommands"

diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_4.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_4.yaml
@@ -58,12 +58,12 @@ tests:
 
 
           2.  run below subscribe-event  command in interactive mode shell and then Turn down the TH (all-clusters-app)
-          basic subscribe-event shut-down 20 100 1 0
+          basicinformation subscribe-event shut-down 20 100 1 0
 
           On TH(all-cluster-app), ,verify that Shutdown event has priority set as CRITICAL (0x2)
 
           [1666095658.719821][16788:16788] CHIP:DMG: Unblock report hold after min 20 seconds
-          ^C[1666095661.196050][16788:16788] CHIP:DL: Caught signal 2
+          [1666095661.196050][16788:16788] CHIP:DL: Caught signal 2
           [1666095661.196434][16788:16788] CHIP:DL: Select failed: ../../third_party/connectedhomeip/src/system/SystemLayerImplSelect.cpp:493: OS Error 0x02000004: Interrupted system call
           [1666095661.196516][16788:16788] CHIP:ZCL: Emitting ShutDown event
           [1666095661.196659][16788:16788] CHIP:EVL: LogEvent event number: 0x0000000000000004 priority: 2, endpoint id:  0x0 cluster id: 0x0000_0028 event id: 0x1 Sys timestamp: 0x0000000006C599DA
@@ -208,7 +208,7 @@ tests:
           To verify leave event follow the below commands
 
           1. ./chip-tool interactive start
-          2. basic subscribe-event leave 1 100 1 0
+          2. basicinformation subscribe-event leave 1 100 1 0
           3. operationalcredentials remove-fabric 1 1 0
 
           verify that leave event has priority as INFO(0x1) on TH (all-clusters-app)

diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml
@@ -60,9 +60,8 @@ tests:
     - label: "TH reads the StateValue attribute from the DUT"
       PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000
       verification: |
-          ./chip-tool booleanstate read state-value 1 1
-
           On TH(chip-tool), verify the StateValue value as TRUE
+          ./chip-tool booleanstate read state-value 1 1
 
           [1646118838.087500][3279:3284] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0045 Attribute 0x0000_0000DataVersion: 2127727071
           [1646118838.087536][3279:3284] CHIP:TOO:   StateValue: TRUE

diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_3_1_Simulated.yaml
@@ -27,9 +27,9 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Wait for the device to be commissioned"
-      cluster: "DelayCommands"
-      command: "WaitForCommissioning"
+    #- label: "Wait for the device to be commissioned"
+    #  cluster: "DelayCommands"
+    #  command: "WaitForCommissioning"
 
     - label: "Read attribute: StateValue"
       wait: "readAttribute"