Update TC_OCC_2_1.py (project-chip#35324)

* Update TC_OCC_2_1.py

Updating TC 2.1 to address issue (project-chip#35318)

* Update TC_OCC_2_1.py

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: Tennessee Carmel-Veilleux <tennessee.carmelveilleux@gmail.com>

* Update src/python_testing/TC_OCC_2_1.py

Co-authored-by: Leo Rozendaal <leo.rozendaal@signify.com>

---------

Co-authored-by: Tennessee Carmel-Veilleux <tennessee.carmelveilleux@gmail.com>
Co-authored-by: Leo Rozendaal <leo.rozendaal@signify.com>

Author: 3 people

src/python_testing/TC_OCC_2_1.py

@@ -121,25 +121,31 @@ async def test_TC_OCC_2_1(self):
             hold_time_limits_dut = await self.read_occ_attribute_expect_success(endpoint=endpoint, attribute=attributes.HoldTimeLimits)
             asserts.assert_less_equal(hold_time_limits_dut.holdTimeMin, hold_time_limits_dut.holdTimeMax,
                                       "HoldTimeMin is not in valid range")
-            asserts.assert_greater_equal(hold_time_limits_dut.holdTimeMin, 0, "HoldTimeMin is not in valid range")
-            asserts.assert_less_equal(hold_time_limits_dut.holdTimeMax, 0xFFFE, "HoldTimeMin is not in valid range")
-            asserts.assert_greater_equal(hold_time_limits_dut.holdTimeMax,
-                                         hold_time_limits_dut.holdTimeMin, "HoldTimeMin is not in valid range")
+            asserts.assert_greater_equal(hold_time_limits_dut.holdTimeMin, 1, "HoldTimeMin is less than 1.")
+            asserts.assert_greater_equal(hold_time_limits_dut.holdTimeMax, 10, "HoldTimeMax is less than 10.")
+            asserts.assert_less_equal(hold_time_limits_dut.holdTimeMin, 0xFFFE, "HoldTimeMin is not in valid range.")
+            asserts.assert_less_equal(hold_time_limits_dut.holdTimeMax, 0xFFFE, "HoldTimeMax is not in valid range.")
+            asserts.assert_greater_equal(hold_time_limits_dut.holdTimeMax, hold_time_limits_dut.holdTimeMin,
+                                         "HoldTimeMax is less than HoldTimeMin.")
             asserts.assert_less_equal(hold_time_limits_dut.holdTimeDefault,
-                                      hold_time_limits_dut.holdTimeMax, "HoldTimeMin is not in valid range")
+                                      hold_time_limits_dut.holdTimeMax, "HoldTimeDefault is greater than HoldTimeMax.")
             asserts.assert_greater_equal(hold_time_limits_dut.holdTimeDefault,
-                                         hold_time_limits_dut.holdTimeMin, "HoldTimeMin is not in valid range")
+                                         hold_time_limits_dut.holdTimeMin, "HoldTimeDefault is less than HoldTimeMin.")
         else:
             logging.info("HoldTimeLimits not supported. Test step skipped")
             self.mark_current_step_skipped()
 
         self.step(6)
         if attributes.HoldTime.attribute_id in attribute_list:
+            asserts.assert_in(attributes.HoldTimeLimits.attribute_id, attribute_list,
+                              "HoldTimeLimits attribute conformance failed.")
             hold_time_dut = await self.read_occ_attribute_expect_success(endpoint=endpoint, attribute=attributes.HoldTime)
             hold_time_limits_dut = await self.read_occ_attribute_expect_success(endpoint=endpoint, attribute=attributes.HoldTimeLimits)
 
-            asserts.assert_less_equal(hold_time_dut, hold_time_limits_dut.holdTimeMax, "HoldTime attribute is out of range")
-            asserts.assert_greater_equal(hold_time_dut, hold_time_limits_dut.holdTimeMin, "HoldTime attribute is out of range")
+            asserts.assert_less_equal(hold_time_dut, hold_time_limits_dut.holdTimeMax,
+                                      "HoldTime attribute is greater than HoldTimeMax.")
+            asserts.assert_greater_equal(hold_time_dut, hold_time_limits_dut.holdTimeMin,
+                                         "HoldTime attribute is less than HoldTimeMin.")
         else:
             logging.info("HoldTime not supported. The rest of legacy attribute test can be skipped")
             self.skip_all_remaining_steps(7)