Skip to content

Commit c730701

Browse files
authored
Wait at least max_report_interval_sec (#36771)
1 parent 9d3f291 commit c730701

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/python_testing/TC_MCORE_FS_1_2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async def test_TC_MCORE_FS_1_2(self):
166166
nodeid=self.dut_node_id,
167167
attributes=subscription_contents,
168168
reportInterval=(min_report_interval_sec, max_report_interval_sec),
169-
keepSubscriptions=False
169+
keepSubscriptions=True
170170
)
171171

172172
parts_list_queue = queue.Queue()

src/python_testing/TC_MCORE_FS_1_5.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ async def test_TC_MCORE_FS_1_5(self):
173173
nodeid=self.dut_node_id,
174174
attributes=parts_list_subscription_contents,
175175
reportInterval=(min_report_interval_sec, max_report_interval_sec),
176-
keepSubscriptions=False
176+
keepSubscriptions=True
177177
)
178178

179179
parts_list_queue = queue.Queue()
@@ -249,14 +249,15 @@ async def test_TC_MCORE_FS_1_5(self):
249249
await self.default_controller.CommissionOnNetwork(nodeId=self.th_server_local_nodeid, setupPinCode=passcode, filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=discriminator)
250250

251251
self.step(6)
252+
max_report_interval_sec = 10
252253
cadmin_subscription_contents = [
253254
(newly_added_endpoint, Clusters.AdministratorCommissioning)
254255
]
255256
self._cadmin_subscription = await self.default_controller.ReadAttribute(
256257
nodeid=self.dut_node_id,
257258
attributes=cadmin_subscription_contents,
258259
reportInterval=(min_report_interval_sec, max_report_interval_sec),
259-
keepSubscriptions=False
260+
keepSubscriptions=True
260261
)
261262

262263
cadmin_queue = queue.Queue()
@@ -282,7 +283,7 @@ async def test_TC_MCORE_FS_1_5(self):
282283
current_fabric_index, "AdminFabricIndex is unexpected")
283284

284285
self.step(10)
285-
report_waiting_timeout_delay_sec = 10
286+
report_waiting_timeout_delay_sec = max_report_interval_sec + 1
286287
logging.info("Waiting for update to AdministratorCommissioning attributes.")
287288
start_time = time.time()
288289
elapsed = 0

0 commit comments

Comments
 (0)