Skip to content

Commit 6924b1c

Browse files
committed
Moving legacy check to a function
1 parent 545114a commit 6924b1c

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

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

+15-10
Original file line numberDiff line numberDiff line change
@@ -1208,6 +1208,20 @@ async def send_single_cmd(
12081208
payloadCapability=payloadCapability)
12091209
return result
12101210

1211+
async def check_legacy_test_event_triggers(self, eventTrigger: int) -> int:
1212+
target_endpoint = 0
1213+
1214+
if self.matter_test_config.legacy:
1215+
logger.info("Legacy test event trigger activated")
1216+
else:
1217+
logger.info("Legacy test event trigger deactivated")
1218+
target_endpoint = self.get_endpoint()
1219+
1220+
# Sets endpoint in eventTrigger
1221+
eventTrigger = eventTrigger | (target_endpoint << 32)
1222+
1223+
return eventTrigger
1224+
12111225
async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = None):
12121226
"""This helper function sends a test event trigger to the General Diagnostics cluster on endpoint 0
12131227
@@ -1224,16 +1238,7 @@ async def send_test_event_triggers(self, eventTrigger: int, enableKey: bytes = N
12241238
else:
12251239
enableKey = self.matter_test_config.global_test_params['enableKey']
12261240

1227-
target_endpoint = 0
1228-
1229-
if self.matter_test_config.legacy:
1230-
logger.info("Legacy test event trigger activated")
1231-
else:
1232-
logger.info("Legacy test event trigger deactivated")
1233-
target_endpoint = self.get_endpoint()
1234-
1235-
# Sets endpoint in eventTrigger
1236-
eventTrigger = eventTrigger | (target_endpoint << 32)
1241+
eventTrigger = await self.check_legacy_test_event_triggers(eventTrigger)
12371242

12381243
try:
12391244
# GeneralDiagnostics cluster is meant to be on Endpoint 0 (Root)

0 commit comments

Comments
 (0)