From c730701dded69c464677b77aecf518d1fad8bbf0 Mon Sep 17 00:00:00 2001
From: Yufeng Wang <yufengwang@google.com>
Date: Tue, 10 Dec 2024 11:40:36 -0800
Subject: [PATCH] Wait at least max_report_interval_sec (#36771)

---
 src/python_testing/TC_MCORE_FS_1_2.py | 2 +-
 src/python_testing/TC_MCORE_FS_1_5.py | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/python_testing/TC_MCORE_FS_1_2.py b/src/python_testing/TC_MCORE_FS_1_2.py
index ffcbe006a3a50a..8fd9c38c2dd6cf 100644
--- a/src/python_testing/TC_MCORE_FS_1_2.py
+++ b/src/python_testing/TC_MCORE_FS_1_2.py
@@ -166,7 +166,7 @@ async def test_TC_MCORE_FS_1_2(self):
             nodeid=self.dut_node_id,
             attributes=subscription_contents,
             reportInterval=(min_report_interval_sec, max_report_interval_sec),
-            keepSubscriptions=False
+            keepSubscriptions=True
         )
 
         parts_list_queue = queue.Queue()
diff --git a/src/python_testing/TC_MCORE_FS_1_5.py b/src/python_testing/TC_MCORE_FS_1_5.py
index bd2f40a2ead49e..2cfcd3ecbfd21e 100755
--- a/src/python_testing/TC_MCORE_FS_1_5.py
+++ b/src/python_testing/TC_MCORE_FS_1_5.py
@@ -173,7 +173,7 @@ async def test_TC_MCORE_FS_1_5(self):
             nodeid=self.dut_node_id,
             attributes=parts_list_subscription_contents,
             reportInterval=(min_report_interval_sec, max_report_interval_sec),
-            keepSubscriptions=False
+            keepSubscriptions=True
         )
 
         parts_list_queue = queue.Queue()
@@ -249,6 +249,7 @@ async def test_TC_MCORE_FS_1_5(self):
         await self.default_controller.CommissionOnNetwork(nodeId=self.th_server_local_nodeid, setupPinCode=passcode, filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=discriminator)
 
         self.step(6)
+        max_report_interval_sec = 10
         cadmin_subscription_contents = [
             (newly_added_endpoint, Clusters.AdministratorCommissioning)
         ]
@@ -256,7 +257,7 @@ async def test_TC_MCORE_FS_1_5(self):
             nodeid=self.dut_node_id,
             attributes=cadmin_subscription_contents,
             reportInterval=(min_report_interval_sec, max_report_interval_sec),
-            keepSubscriptions=False
+            keepSubscriptions=True
         )
 
         cadmin_queue = queue.Queue()
@@ -282,7 +283,7 @@ async def test_TC_MCORE_FS_1_5(self):
                              current_fabric_index, "AdminFabricIndex is unexpected")
 
         self.step(10)
-        report_waiting_timeout_delay_sec = 10
+        report_waiting_timeout_delay_sec = max_report_interval_sec + 1
         logging.info("Waiting for update to AdministratorCommissioning attributes.")
         start_time = time.time()
         elapsed = 0