@@ -106,7 +106,7 @@ def stash_globally(o: object) -> str:
106106 return id
107107
108108
109- def unstash_globally (id : str ) -> object :
109+ def unstash_globally (id : str ) -> Any :
110110 return _GLOBAL_DATA .get (id )
111111
112112
@@ -205,7 +205,7 @@ def utc_datetime_from_posix_time_ms(posix_time_ms: int) -> datetime:
205205 return datetime .fromtimestamp (seconds , timezone .utc ) + timedelta (milliseconds = millis )
206206
207207
208- def compare_time (received : int , offset : timedelta = timedelta (), utc : int = None , tolerance : timedelta = timedelta (seconds = 5 )) -> None :
208+ def compare_time (received : int , offset : timedelta = timedelta (), utc : Optional [ int ] = None , tolerance : timedelta = timedelta (seconds = 5 )) -> None :
209209 if utc is None :
210210 utc = utc_time_in_matter_epoch ()
211211
@@ -243,7 +243,7 @@ def __init__(self, expected_cluster: ClusterObjects.Cluster):
243243 """This class creates a queue to store received event callbacks, that can be checked by the test script
244244 expected_cluster: is the cluster from which the events are expected
245245 """
246- self ._q = queue .Queue ()
246+ self ._q : queue . Queue = queue .Queue ()
247247 self ._expected_cluster = expected_cluster
248248
249249 async def start (self , dev_ctrl , node_id : int , endpoint : int , fabric_filtered : bool = False , min_interval_sec : int = 0 , max_interval_sec : int = 30 ) -> Any :
@@ -976,7 +976,7 @@ def get_test_steps(self, test: str) -> list[TestStep]:
976976 steps = self .get_defined_test_steps (test )
977977 return [TestStep (1 , "Run entire test" )] if steps is None else steps
978978
979- def get_defined_test_steps (self , test : str ) -> list [TestStep ]:
979+ def get_defined_test_steps (self , test : str ) -> Optional [ list [TestStep ] ]:
980980 steps_name = f'steps_{ test .removeprefix ("test_" )}
981981 try :
982982 fn = getattr (self , steps_name )
@@ -996,7 +996,7 @@ def get_test_pics(self, test: str) -> list[str]:
996996 pics = self ._get_defined_pics (test )
997997 return [] if pics is None else pics
998998
999- def _get_defined_pics (self , test : str ) -> list [TestStep ]:
999+ def _get_defined_pics (self , test : str ) -> Optional [ list [str ] ]:
10001000 steps_name = f'pics_{ test .removeprefix ("test_" )}
10011001 try :
10021002 fn = getattr (self , steps_name )
@@ -1093,7 +1093,7 @@ def matter_test_config(self) -> MatterTestConfig:
10931093 return unstash_globally (self .user_params .get ("matter_test_config" ))
10941094
10951095 @property
1096- def default_controller (self ) -> ChipDeviceCtrl :
1096+ def default_controller (self ) -> ChipDeviceCtrl . ChipDeviceController :
10971097 return unstash_globally (self .user_params .get ("default_controller" ))
10981098
10991099 @property
@@ -1162,7 +1162,7 @@ def check_pics(self, pics_key: str) -> bool:
11621162 def is_pics_sdk_ci_only (self ) -> bool :
11631163 return self .check_pics ('PICS_SDK_CI_ONLY' )
11641164
1165- async def open_commissioning_window (self , dev_ctrl : Optional [ChipDeviceCtrl ] = None , node_id : Optional [int ] = None , timeout : int = 900 ) -> CustomCommissioningParameters :
1165+ async def open_commissioning_window (self , dev_ctrl : Optional [ChipDeviceCtrl . ChipDeviceController ] = None , node_id : Optional [int ] = None , timeout : int = 900 ) -> CustomCommissioningParameters :
11661166 rnd_discriminator = random .randint (0 , 4095 )
11671167 if dev_ctrl is None :
11681168 dev_ctrl = self .default_controller
@@ -1178,14 +1178,14 @@ async def open_commissioning_window(self, dev_ctrl: Optional[ChipDeviceCtrl] = N
11781178 asserts .fail (e .status , 'Failed to open commissioning window' )
11791179
11801180 async def read_single_attribute (
1181- self , dev_ctrl : ChipDeviceCtrl , node_id : int , endpoint : int , attribute : object , fabricFiltered : bool = True ) -> object :
1181+ self , dev_ctrl : ChipDeviceCtrl . ChipDeviceController , node_id : int , endpoint : int , attribute : object , fabricFiltered : bool = True ) -> object :
11821182 result = await dev_ctrl .ReadAttribute (node_id , [(endpoint , attribute )], fabricFiltered = fabricFiltered )
11831183 data = result [endpoint ]
11841184 return list (data .values ())[0 ][attribute ]
11851185
11861186 async def read_single_attribute_check_success (
11871187 self , cluster : Clusters .ClusterObjects .ClusterCommand , attribute : Clusters .ClusterObjects .ClusterAttributeDescriptor ,
1188- dev_ctrl : ChipDeviceCtrl = None , node_id : int = None , endpoint : int = None , fabric_filtered : bool = True , assert_on_error : bool = True , test_name : str = "" ) -> object :
1188+ dev_ctrl : Optional [ ChipDeviceCtrl . ChipDeviceController ] = None , node_id : Optional [ int ] = None , endpoint : Optional [ int ] = None , fabric_filtered : bool = True , assert_on_error : bool = True , test_name : str = "" ) -> object :
11891189 if dev_ctrl is None :
11901190 dev_ctrl = self .default_controller
11911191 if node_id is None :
@@ -1216,7 +1216,7 @@ async def read_single_attribute_check_success(
12161216
12171217 async def read_single_attribute_expect_error (
12181218 self , cluster : object , attribute : object ,
1219- error : Status , dev_ctrl : ChipDeviceCtrl = None , node_id : int = None , endpoint : int = None ,
1219+ error : Status , dev_ctrl : Optional [ ChipDeviceCtrl . ChipDeviceController ] = None , node_id : Optional [ int ] = None , endpoint : Optional [ int ] = None ,
12201220 fabric_filtered : bool = True , assert_on_error : bool = True , test_name : str = "" ) -> object :
12211221 if dev_ctrl is None :
12221222 dev_ctrl = self .default_controller
@@ -1241,7 +1241,7 @@ async def read_single_attribute_expect_error(
12411241
12421242 return attr_ret
12431243
1244- async def write_single_attribute (self , attribute_value : object , endpoint_id : int = None , expect_success : bool = True ) -> Status :
1244+ async def write_single_attribute (self , attribute_value : object , endpoint_id : Optional [ int ] = None , expect_success : bool = True ) -> Status :
12451245 """Write a single `attribute_value` on a given `endpoint_id` and assert on failure.
12461246
12471247 If `endpoint_id` is None, the default DUT endpoint for the test is selected.
@@ -1263,7 +1263,7 @@ async def write_single_attribute(self, attribute_value: object, endpoint_id: int
12631263
12641264 async def send_single_cmd (
12651265 self , cmd : Clusters .ClusterObjects .ClusterCommand ,
1266- dev_ctrl : ChipDeviceCtrl = None , node_id : int = None , endpoint : int = None ,
1266+ dev_ctrl : Optional [ ChipDeviceCtrl . ChipDeviceController ] = None , node_id : Optional [ int ] = None , endpoint : Optional [ int ] = None ,
12671267 timedRequestTimeoutMs : typing .Union [None , int ] = None ,
12681268 payloadCapability : int = ChipDeviceCtrl .TransportPayloadCapability .MRP_PAYLOAD ) -> object :
12691269 if dev_ctrl is None :
0 commit comments