Modified the test to have a value closer to the max tolerated

project-chip · Jan 19, 2024 · 0728ee6 · 0728ee6
1 parent 25fa0f6
commit 0728ee6
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 56 deletions.
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -12284,11 +12284,5 @@
       "endpointId": 65534,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -5928,11 +5928,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap
@@ -5876,11 +5876,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap
@@ -5060,11 +5060,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
@@ -15125,11 +15125,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
@@ -14917,11 +14917,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_thread.zap b/examples/thermostat/nxp/zap/thermostat_matter_thread.zap
@@ -4902,11 +4902,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap b/examples/thermostat/nxp/zap/thermostat_matter_wifi.zap
@@ -4044,11 +4044,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap
@@ -6090,11 +6090,5 @@
       "endpointId": 1,
       "networkId": 0
     }
-<<<<<<< HEAD
   ]
 }
-=======
-  ],
-  "log": []
-}
->>>>>>> 1d71d2acd9 (Reworked .zap and .matter files)
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
@@ -496,7 +496,7 @@ tests:
     - label:
           "Step 8a: TH sends a AddScene command to DUT with the GroupID field
           set to G1, the SceneID field set to 0x01, the TransitionTime field set
-          to 60 000 000 (60 000s) and no extension field sets. This should fail
+          to 7 000 000 (7 000s) and no extension field sets. This should fail
           and return a status of 0x85 (INVALID_COMMAND) because we exceed the
           max TransitionTime"
       PICS: S.S.C00.Rsp && PICS_SDK_CI_ONLY
@@ -508,7 +508,7 @@ tests:
               - name: "SceneID"
                 value: 0x01
               - name: "TransitionTime"
-                value: 60000000
+                value: 7000000
               - name: "SceneName"
                 value: "Scene1"
               - name: "ExtensionFieldSets"