Updated TC_OpstateCommon, TC_RVCOPSTATE_2_1, and matter_testing support:

- Resolved issues with attributes_guard function in matter_testing support module

src/python_testing/TC_OpstateCommon.py

@@ -27,7 +27,7 @@
 from chip.clusters.Attribute import EventReadResult, SubscriptionTransaction
 from chip.clusters.Types import NullValue
 from chip.interaction_model import InteractionModelError, Status
-from chip.testing.matter_testing import ClusterAttributeChangeAccumulator, EventChangeCallback, TestStep, has_attribute
+from chip.testing.matter_testing import ClusterAttributeChangeAccumulator, EventChangeCallback, TestStep
 from mobly import asserts
 
 
@@ -248,7 +248,7 @@ async def TEST_TC_OPSTATE_BASE_1_1(self, endpoint=1, cluster_revision=1, feature
             attributes.ClusterRevision.attribute_id
         ]
 
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             expected_value.append(attributes.CountdownTime.attribute_id)
 
         await self.read_and_expect_array_contains(endpoint=endpoint,
@@ -347,7 +347,7 @@ async def TEST_TC_OPSTATE_BASE_2_1(self, endpoint=1):
 
         # STEP 2: TH reads from the DUT the PhaseList attribute
         self.step(2)
-        if self.attributes_guard(has_attribute(attributes.PhaseList)):
+        if self.attributes_guard(attributes.PhaseList):
             phase_list = await self.read_expect_success(endpoint=endpoint,
                                                         attribute=attributes.PhaseList)
             if phase_list is not NullValue:
@@ -357,7 +357,7 @@ async def TEST_TC_OPSTATE_BASE_2_1(self, endpoint=1):
 
         # STEP 3: TH reads from the DUT the CurrentPhase attribute
         self.step(3)
-        if self.attributes_guard(has_attribute(attributes.CurrentPhase)):
+        if self.attributes_guard(attributes.CurrentPhase):
             current_phase = await self.read_expect_success(endpoint=endpoint,
                                                            attribute=attributes.CurrentPhase)
             if (phase_list == NullValue) or (not phase_list):
@@ -369,7 +369,7 @@ async def TEST_TC_OPSTATE_BASE_2_1(self, endpoint=1):
 
         # STEP 4: TH reads from the DUT the CountdownTime attribute
         self.step(4)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                             attribute=attributes.CountdownTime)
             if countdown_time is not NullValue:
@@ -378,7 +378,7 @@ async def TEST_TC_OPSTATE_BASE_2_1(self, endpoint=1):
 
         # STEP 5: TH reads from the DUT the OperationalStateList attribute
         self.step(5)
-        if self.attributes_guard(has_attribute(attributes.OperationalStateList)):
+        if self.attributes_guard(attributes.OperationalStateList):
             operational_state_list = await self.read_expect_success(endpoint=endpoint,
                                                                     attribute=attributes.OperationalStateList)
             defined_states = [state.value for state in cluster.Enums.OperationalStateEnum
@@ -464,7 +464,7 @@ async def TEST_TC_OPSTATE_BASE_2_1(self, endpoint=1):
 
         # STEP 7: TH reads from the DUT the OperationalError attribute
         self.step(7)
-        if self.attributes_guard(has_attribute(attributes.OperationalError)):
+        if self.attributes_guard(attributes.OperationalError):
             operational_error = await self.read_expect_success(endpoint=endpoint,
                                                                attribute=attributes.OperationalError)
             # Defined Errors
@@ -600,7 +600,7 @@ async def TEST_TC_OPSTATE_BASE_2_2(self, endpoint=1):
 
         # STEP 3: TH reads from the DUT the OperationalStateList attribute
         self.step(3)
-        if self.attributes_guard(has_attribute(attributes.OperationalStateList)):
+        if self.attributes_guard(attributes.OperationalStateList):
             operational_state_list = await self.read_expect_success(endpoint=endpoint,
                                                                     attribute=attributes.OperationalStateList)
 
@@ -628,15 +628,15 @@ async def TEST_TC_OPSTATE_BASE_2_2(self, endpoint=1):
 
         # STEP 6: TH reads from the DUT the OperationalError attribute
         self.step(6)
-        if self.attributes_guard(has_attribute(attributes.OperationalError)):
+        if self.attributes_guard(attributes.OperationalError):
             await self.read_and_expect_property_value(endpoint=endpoint,
                                                       attribute=attributes.OperationalError,
                                                       attr_property="errorStateID",
                                                       expected_value=cluster.Enums.ErrorStateEnum.kNoError)
 
         # STEP 7: TH reads from the DUT the CountdownTime attribute
         self.step(7)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             initial_countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                                     attribute=attributes.CountdownTime)
             if initial_countdown_time is not NullValue:
@@ -645,7 +645,7 @@ async def TEST_TC_OPSTATE_BASE_2_2(self, endpoint=1):
 
         # STEP 8: TH reads from the DUT the PhaseList attribute
         self.step(8)
-        if self.attributes_guard(has_attribute(attributes.PhaseList)):
+        if self.attributes_guard(attributes.PhaseList):
             phase_list = await self.read_expect_success(endpoint=endpoint,
                                                         attribute=attributes.PhaseList)
             phase_list_len = 0
@@ -656,7 +656,7 @@ async def TEST_TC_OPSTATE_BASE_2_2(self, endpoint=1):
 
         # STEP 9: TH reads from the DUT the CurrentPhase attribute
         self.step(9)
-        if self.attributes_guard(has_attribute(attributes.CurrentPhase)):
+        if self.attributes_guard(attributes.CurrentPhase):
             current_phase = await self.read_expect_success(endpoint=endpoint,
                                                            attribute=attributes.CurrentPhase)
             if (phase_list == NullValue) or (not phase_list):
@@ -669,12 +669,12 @@ async def TEST_TC_OPSTATE_BASE_2_2(self, endpoint=1):
 
         # STEP 10: TH waits for {PIXIT.WAITTIME.COUNTDOWN}
         self.step(10)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             time.sleep(wait_time)
 
         # STEP 11: TH reads from the DUT the CountdownTime attribute
         self.step(11)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                             attribute=attributes.CountdownTime)
 
@@ -815,7 +815,7 @@ async def TEST_TC_OPSTATE_BASE_2_3(self, endpoint=1):
 
         # STEP 6: TH reads from the DUT the CountdownTime attribute
         self.step(6)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             initial_countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                                     attribute=attributes.CountdownTime)
             if initial_countdown_time is not NullValue:
@@ -829,7 +829,7 @@ async def TEST_TC_OPSTATE_BASE_2_3(self, endpoint=1):
 
         # STEP 8: TH reads from the DUT the CountdownTime attribute
         self.step(8)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                             attribute=attributes.CountdownTime)
 
@@ -1061,7 +1061,7 @@ async def TEST_TC_OPSTATE_BASE_2_5(self, endpoint=1):
 
         # STEP 5: TH reads from the DUT the CountdownTime attribute
         self.step(5)
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if self.attributes_guard(attributes.CountdownTime):
             initial_countdown_time = await self.read_expect_success(endpoint=endpoint,
                                                                     attribute=attributes.CountdownTime)
 

src/python_testing/TC_RVCOPSTATE_2_1.py

@@ -33,17 +33,16 @@
 #       --trace-to json:${TRACE_TEST_JSON}.json
 #       --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto
 #     factory-reset: true
-#     quiet: true
+#     quiet: false
 # === END CI TEST ARGUMENTS ===
 
 import logging
 
 import chip.clusters as Clusters
 from chip.clusters.Types import NullValue
-from chip.testing.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main, has_attribute
+from chip.testing.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
-
 class TC_RVCOPSTATE_2_1(MatterBaseTest):
     def __init__(self, *args):
         super().__init__(*args)
@@ -103,7 +102,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
         if self.is_ci:
             self.write_to_app_pipe({"Name": "Reset"})
 
-        if self.attributes_guard(has_attribute(attributes.PhaseList)):
+        if self.attributes_guard(attributes.PhaseList):
             self.print_step(2, "Read PhaseList attribute")
             phase_list = await self.read_mod_attribute_expect_success(endpoint=self.endpoint, attribute=attributes.PhaseList)
 
@@ -116,7 +115,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
 
                 asserts.assert_less_equal(phase_list_len, 32, "PhaseList length(%d) must be less than 32!" % phase_list_len)
 
-        if self.attributes_guard(has_attribute(attributes.CurrentPhase)):
+        if self.attributes_guard(attributes.CurrentPhase):
             self.print_step(3, "Read CurrentPhase attribute")
             current_phase = await self.read_mod_attribute_expect_success(endpoint=self.endpoint, attribute=attributes.CurrentPhase)
             logging.info("CurrentPhase: %s" % (current_phase))
@@ -127,7 +126,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
                 asserts.assert_true(0 <= current_phase < phase_list_len,
                                     "CurrentPhase(%s) must be between 0 and %d" % (current_phase, (phase_list_len - 1)))
 
-        if self.attributes_guard(has_attribute(attributes.CountdownTime)):
+        if await self.attributes_guard(attributes.CountdownTime):
             self.print_step(4, "Read CountdownTime attribute")
             countdown_time = await self.read_mod_attribute_expect_success(endpoint=self.endpoint,
                                                                           attribute=attributes.CountdownTime)
@@ -137,7 +136,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
                 asserts.assert_true(countdown_time >= 0 and countdown_time <= 259200,
                                     "CountdownTime(%s) must be between 0 and 259200" % countdown_time)
 
-        if self.attributes_guard(has_attribute(attributes.OperationalStateList)):
+        if self.attributes_guard(attributes.OperationalStateList):
             self.print_step(5, "Read OperationalStateList attribute")
             operational_state_list = await self.read_mod_attribute_expect_success(endpoint=self.endpoint,
                                                                                   attribute=attributes.OperationalStateList)
@@ -160,7 +159,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
 
             asserts.assert_true(error_state_present, "The OperationalStateList does not have an ID entry of Error(0x03)")
 
-        if self.attributes_guard(has_attribute(attributes.OperationalState)):
+        if self.attributes_guard(attributes.OperationalState):
             self.print_step(6, "Read OperationalState attribute")
             operational_state = await self.read_mod_attribute_expect_success(endpoint=self.endpoint,
                                                                              attribute=attributes.OperationalState)
@@ -227,7 +226,7 @@ async def test_TC_RVCOPSTATE_2_1(self):
                     self.wait_for_user_input(prompt_msg=f"{test_step}, and press Enter when done.\n")
                 await self.read_and_validate_opstate(step="6n", expected_state=Clusters.RvcOperationalState.Enums.OperationalStateEnum.kDocked)
 
-        if self.attributes_guard(has_attribute(attributes.OperationalError)):
+        if self.attributes_guard(attributes.OperationalError):
             self.print_step(7, "Read OperationalError attribute")
             operational_error = await self.read_mod_attribute_expect_success(endpoint=self.endpoint,
                                                                              attribute=attributes.OperationalError)

src/python_testing/matter_testing_infrastructure/chip/testing/matter_testing.py

@@ -1428,9 +1428,10 @@ def attributes_guard(self, attribute_condition: bool):
               if self.attribute_guard(condition2_needs_to_be_false_to_skip_step):
                   # skip step 2 if condition not met
            """
-        if not attribute_condition:
+        attr_condition = await asyncio.wait_for(should_run_test_on_endpoint(self, has_attribute(attribute_condition)), timeout=60)
+        if not attr_condition:
             self.mark_current_step_skipped()
-        return attribute_condition
+        return attr_condition
 
     def mark_current_step_skipped(self):
         try: