Fix fabric sync test timeouts (project-chip#35417)

* Override timeout for FabricSync tests

* Bump up timeouts just a little more

* Remove TODOs that actually won't change since test will need to wait upto time anyways

* Add unsaved files

Author: tehampson

src/python_testing/TC_BRBINFO_4_1.py

@@ -47,10 +47,11 @@ class TC_BRBINFO_4_1(MatterBaseTest):
     async def _read_attribute_expect_success(self, endpoint, cluster, attribute, node_id):
         return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute, node_id=node_id)
 
-    # Override default timeout to support a 60 min wait
+    # This test has some manual steps and also multiple sleeps >= 30 seconds. Test typically runs under 3 mins,
+    # so 6 minutes is more than enough.
     @property
     def default_timeout(self) -> int:
-        return 63*60
+        return 6*60
 
     def desc_TC_BRBINFO_4_1(self) -> str:
         """Returns a description of this test"""

src/python_testing/TC_CCTRL_2_2.py

@@ -119,6 +119,12 @@ def steps_TC_CCTRL_2_2(self) -> list[TestStep]:
 
         return steps
 
+    # This test has some manual steps and also multiple sleeps for up to 30 seconds. Test typically runs
+    # under 2 mins, so 4 minutes is more than enough.
+    @property
+    def default_timeout(self) -> int:
+        return 4*60
+
     @run_if_endpoint_matches(has_cluster(Clusters.CommissionerControl))
     async def test_TC_CCTRL_2_2(self):
         self.is_ci = self.check_pics('PICS_SDK_CI_ONLY')

src/python_testing/TC_CCTRL_2_3.py

@@ -103,6 +103,12 @@ def steps_TC_CCTRL_2_3(self) -> list[TestStep]:
 
         return steps
 
+    # This test has some manual steps and one sleep for up to 30 seconds. Test typically
+    # runs under 1 mins, so 3 minutes is more than enough.
+    @property
+    def default_timeout(self) -> int:
+        return 3*60
+
     @per_endpoint_test(has_cluster(Clusters.CommissionerControl))
     async def test_TC_CCTRL_2_3(self):
         self.is_ci = self.check_pics('PICS_SDK_CI_ONLY')

src/python_testing/TC_ECOINFO_2_2.py

@@ -42,6 +42,12 @@ def steps_TC_ECOINFO_2_2(self) -> list[TestStep]:
 
         return steps
 
+    # This test has some manual steps, so we need a longer timeout. Test typically runs under 1 mins so 3 mins should
+    # be enough time for test to run
+    @property
+    def default_timeout(self) -> int:
+        return 3*60
+
     @async_test_body
     async def test_TC_ECOINFO_2_2(self):
         dev_ctrl = self.default_controller

src/python_testing/TC_MCORE_FS_1_1.py

@@ -87,6 +87,12 @@ def steps_TC_MCORE_FS_1_1(self) -> list[TestStep]:
                  TestStep("3c", "DUT_FSA commissions TH_FSA")]
         return steps
 
+    # This test has some manual steps and one sleep for up to 30 seconds. Test typically
+    # runs under 1 mins, so 3 minutes is more than enough.
+    @property
+    def default_timeout(self) -> int:
+        return 3*60
+
     @async_test_body
     async def test_TC_MCORE_FS_1_1(self):
         self.is_ci = self.check_pics('PICS_SDK_CI_ONLY')

src/python_testing/TC_MCORE_FS_1_2.py

@@ -117,9 +117,11 @@ def steps_TC_MCORE_FS_1_2(self) -> list[TestStep]:
                  TestStep(7, "TH reads all attributes in the Bridged Device Basic Information cluster on new endpoint identified in step 3 from the DUT_FSA")]
         return steps
 
+    # This test has some manual steps, so we need a longer timeout. Test typically runs under 1 mins so 3 mins should
+    # be enough time for test to run
     @property
     def default_timeout(self) -> int:
-        return self.user_params.get("report_waiting_timeout_delay_sec", 10)*2 + 60
+        return 3*60
 
     @async_test_body
     async def test_TC_MCORE_FS_1_2(self):

src/python_testing/TC_MCORE_FS_1_5.py

@@ -117,9 +117,11 @@ def steps_TC_MCORE_FS_1_5(self) -> list[TestStep]:
                  TestStep(10, "TH waits up to 10 seconds for subscription report from the AdministratorCommissioning attribute (from step 6) to reflect values from previous step")]
         return steps
 
+    # This test has some manual steps, so we need a longer timeout. Test typically runs under 1 mins so 3 mins should
+    # be enough time for test to run
     @property
     def default_timeout(self) -> int:
-        return self.user_params.get("report_waiting_timeout_delay_sec", 10)*2 + 60
+        return 3*60
 
     @async_test_body
     async def test_TC_MCORE_FS_1_5(self):