@@ -1120,10 +1120,6 @@ def setup_class(self):
1120
1120
self .current_step_index = 0
1121
1121
self .step_start_time = datetime .now (timezone .utc )
1122
1122
self .step_skipped = False
1123
- self .global_wildcard = asyncio .wait_for (self .default_controller .Read (self .dut_node_id , [(Clusters .Descriptor ), Attribute .AttributePath (None , None , GlobalAttributeIds .ATTRIBUTE_LIST_ID ), Attribute .AttributePath (
1124
- None , None , GlobalAttributeIds .FEATURE_MAP_ID ), Attribute .AttributePath (None , None , GlobalAttributeIds .ACCEPTED_COMMAND_LIST_ID )]), timeout = 60 )
1125
- # self.stored_global_wildcard stores value of self.global_wildcard after first async call, appears needed in order to not timeout during commissioning
1126
- self .stored_global_wildcard = None
1127
1123
1128
1124
def setup_test (self ):
1129
1125
self .current_step_index = 0
@@ -1139,6 +1135,9 @@ def setup_test(self):
1139
1135
desc = self .get_test_desc (test_name )
1140
1136
steps_descriptions = [] if steps is None else [step .description for step in steps ]
1141
1137
self .runner_hook .test_start (filename = filename , name = desc , count = num_steps , steps = steps_descriptions )
1138
+ self .global_wildcard = asyncio .run (self .default_controller .Read (self .dut_node_id , [(Clusters .Descriptor ), Attribute .AttributePath (None , None , GlobalAttributeIds .ATTRIBUTE_LIST_ID ), Attribute .AttributePath (
1139
+ None , None , GlobalAttributeIds .FEATURE_MAP_ID ), Attribute .AttributePath (None , None , GlobalAttributeIds .ACCEPTED_COMMAND_LIST_ID )]))
1140
+
1142
1141
# If we don't have defined steps, we're going to start the one and only step now
1143
1142
# if there are steps defined by the test, rely on the test calling the step() function
1144
1143
# to indicates how it is proceeding
@@ -1468,9 +1467,7 @@ async def attribute_guard(self, endpoint: int, attribute: ClusterObjects.Cluster
1468
1467
if self.attribute_guard(condition2_needs_to_be_false_to_skip_step):
1469
1468
# skip step 2 if condition not met
1470
1469
"""
1471
- if self .stored_global_wildcard is None :
1472
- self .stored_global_wildcard = await self .global_wildcard
1473
- attr_condition = _has_attribute (wildcard = self .stored_global_wildcard , endpoint = endpoint , attribute = attribute )
1470
+ attr_condition = _has_attribute (wildcard = self .global_wildcard , endpoint = endpoint , attribute = attribute )
1474
1471
if not attr_condition :
1475
1472
self .mark_current_step_skipped ()
1476
1473
return attr_condition
0 commit comments