Set timeout in JF test cases (project-chip#40019)

* Add timout in all send functions; set a global timeout for send function of 5 minutes

* Shutdown controller in test cases; fix JCM_1_2 timeout error

Author: dparausanu

src/python_testing/TC_JCM_1_1.py

@@ -123,7 +123,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -182,7 +183,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric B
         self.fabric_b_ctrl.send(
             message=f"pairing onnetwork 11 {self.jfadmin_fabric_b_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem B certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -397,6 +399,10 @@ async def test_TC_JCM_1_1(self):
             response[0][Clusters.AccessControl].acl[0].subjects[0],
             "EcoA Server App Subjects field has wrong value")
 
+        # Shutdown the Python Controllers start at the begining
+        devCtrlEcoA.Shutdown()
+        devCtrlEcoB.Shutdown()
+
 
 if __name__ == "__main__":
     default_matter_test_main()

src/python_testing/TC_JCM_1_2.py

@@ -126,7 +126,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -186,7 +187,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric B
         self.fabric_b_ctrl.send(
             message=f"pairing onnetwork 11 {self.jfadmin_fabric_b_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem B certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -292,8 +294,7 @@ async def _joint_commission_EcoB_admin(self, devCtrl, nodeid, passcode, endpoint
             logging.info(f"Starting Joint Commissioning of Ecosystem B jfa-app with node ID {nodeid}")
 
             devCtrl.send(
-                message=f"pairing onnetwork {nodeid} {passcode} --execute-jcm true",
-                expected_output="")
+                message=f"pairing onnetwork {nodeid} {passcode} --execute-jcm true")
 
             logging.info(f"Joint Commissioning completed successfully for node {nodeid}")
 
@@ -306,17 +307,6 @@ async def _joint_commission_EcoB_admin(self, devCtrl, nodeid, passcode, endpoint
     @async_test_body
     async def test_TC_JCM_1_2(self):
 
-        # Creating a Controller for Ecosystem A
-        _fabric_a_persistent_storage = PersistentStorage(jsonData=self.ecoACtrlStorage)
-        _certAuthorityManagerA = CertificateAuthority.CertificateAuthorityManager(
-            chipStack=self.matter_stack._chip_stack,
-            persistentStorage=_fabric_a_persistent_storage)
-        _certAuthorityManagerA.LoadAuthoritiesFromStorage()
-        _devCtrlEcoA = _certAuthorityManagerA.activeCaList[0].adminList[0].NewController(
-            nodeId=101,
-            paaTrustStorePath=str(self.matter_test_config.paa_trust_store_path),
-            catTags=[int(self.ecoACATs, 16)])
-
         # Creating a Controller for Ecosystem B
         _fabric_b_persistent_storage = PersistentStorage(jsonData=self.ecoBCtrlStorage)
         _certAuthorityManagerB = CertificateAuthority.CertificateAuthorityManager(
@@ -376,6 +366,9 @@ async def test_TC_JCM_1_2(self):
         asserts.assert_true(_admin_cat_found, "Administrator CAT not found in Admin App NOC on Ecosystem B")
         asserts.assert_true(_anchor_cat_found, "Anchor CAT not found in Admin App NOC on Ecosystem B")
 
+        # Shutdown the Python Controllers start at the begining
+        devCtrlEcoB.Shutdown()
+
 
 if __name__ == "__main__":
     default_matter_test_main()

src/python_testing/TC_JFDS_2_1.py

@@ -108,7 +108,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -188,6 +189,9 @@ async def test_TC_JFDS_2_1(self):
             returnClusterObject=True)
         asserts.assert_greater_equal(response[1][Clusters.JointFabricDatastore].anchorVendorID, 0)
 
+        # Shutdown the Python Controllers start at the begining
+        devCtrlEcoA.Shutdown()
+
 
 if __name__ == "__main__":
     default_matter_test_main()

src/python_testing/TC_JFDS_2_2.py

@@ -109,7 +109,8 @@ async def setup_class(self):
         # Commission JF-ADMIN app with JF-Controller on Fabric A
         self.fabric_a_ctrl.send(
             message=f"pairing onnetwork 1 {self.jfadmin_fabric_a_passcode} --anchor true",
-            expected_output="[JF] Anchor Administrator commissioned with sucess")
+            expected_output="[JF] Anchor Administrator commissioned with sucess",
+            timeout=10)
 
         # Extract the Ecosystem A certificates and inject them in the storage that will be provided to a new Python Controller later
         jfcStorage = ConfigParser()
@@ -281,6 +282,9 @@ async def test_TC_JFDS_2_2(self):
         # else:
         #     asserts.assert_true(False, 'Expected InteractionModelError with CONSTRANT_ERROR, but no exception occurred!')
 
+        # Shutdown the Python Controllers start at the begining
+        devCtrlEcoA.Shutdown()
+
 
 if __name__ == "__main__":
     default_matter_test_main()

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

@@ -134,7 +134,7 @@ def start(self,
 
     def send(self, message: str, end: str = "\n",
              expected_output: Optional[Union[str, re.Pattern]] = None,
-             timeout: Optional[float] = None):
+             timeout: float = 300):
         """Send a message to a process and optionally wait for a response."""
 
         if expected_output is not None: