CADMIN-1.5: Expect either error (project-chip#42099)

* CADMIN-1.5: Expect either error

* Add comment, swap error

Author: cecille

src/python_testing/TC_CADMIN_1_5.py

@@ -46,25 +46,21 @@
 
 class TC_CADMIN_1_5(CADMINBaseTest):
 
-    async def commission_on_network(self, setup_code: int, discriminator: int, expected_error: int = 0):
+    async def commission_on_network_expect_error(self, setup_code: int, discriminator: int):
         # This is expected to error as steps 4 and 7 expects timeout issue or pase connection error to occur due to commissioning window being closed already
-        if expected_error == 50:
-            with asserts.assert_raises(ChipStackError) as cm:
-                await self.th2.CommissionOnNetwork(
-                    nodeId=self.dut_node_id, setupPinCode=setup_code,
-                    filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=discriminator)
-            asserts.assert_true(int(cm.exception.code) == expected_error,
-                                'Unexpected error code returned from Commissioning Attempt')
-
-        else:
-            try:
-                await self.th2.CommissionOnNetwork(
-                    nodeId=self.dut_node_id, setupPinCode=setup_code,
-                    filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=discriminator)
-
-            except asyncio.CancelledError:
-                # This is expected to fail due to timeout, however there is no code to validate here, so just passing since the correct exception was raised to get to this point
-                pass
+        # The two errors here correspond to either a failure to find the device on dns-sd because it's no longer advertising or a failure to connect
+        # over PASE (in the case where we have a cached address and attempt a connection). Both of these are indications that the commissioning window
+        # is properly closed, which is what this function is expecting.
+        try:
+            await self.th2.CommissionOnNetwork(
+                nodeId=self.dut_node_id, setupPinCode=setup_code,
+                filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=discriminator)
+            asserts.fail("Unexpected success when commissioning")
+        except ChipStackError as cm:  # chipstack-ok
+            asserts.assert_equal(cm.err, ChipDeviceCtrl.CHIP_ERROR_TIMEOUT,
+                                 'Unexpected error code returned from Commissioning Attempt')
+        except asyncio.exceptions.CancelledError:
+            pass
 
     def steps_TC_CADMIN_1_5(self) -> list[TestStep]:
         return [
@@ -128,10 +124,11 @@ async def test_TC_CADMIN_1_5(self):
             expected_discriminator=params.randomDiscriminator
         )
         logging.info(f"Successfully found service with CM={service.txt.get('CM')}, D={service.txt.get('D')}")
+        logging.info("Test will now sleep for 190s while waiting for commissioning window to time out ... ")
         await asyncio.sleep(190)
 
         self.step(4)
-        await self.commission_on_network(setup_code=params.commissioningParameters.setupPinCode, discriminator=params.randomDiscriminator)
+        await self.commission_on_network_expect_error(setup_code=params.commissioningParameters.setupPinCode, discriminator=params.randomDiscriminator)
 
         self.step(5)
         params2 = await self.open_commissioning_window(dev_ctrl=self.th1, timeout=180, node_id=self.dut_node_id)
@@ -142,7 +139,7 @@ async def test_TC_CADMIN_1_5(self):
         await asyncio.sleep(1)
 
         self.step(7)
-        await self.commission_on_network(setup_code=params2.commissioningParameters.setupPinCode, discriminator=params2.randomDiscriminator, expected_error=0x00000032)
+        await self.commission_on_network_expect_error(setup_code=params2.commissioningParameters.setupPinCode, discriminator=params2.randomDiscriminator)
 
         self.step(8)
         try:

src/python_testing/test_metadata.yaml

@@ -150,10 +150,6 @@ not_automated:
       reason: Helper methods for Push AV Integration TCs
     - name: TC_TLS_Utils.py
       reason: Helper methods for TC tests dependent on TLS clusters
-    - name: TC_CADMIN_1_5.py
-      reason:
-          "Flaky/broken: see
-          https://github.com/project-chip/connectedhomeip/issues/42059"
 
 # This is a list of slow tests (just arbitrarily picked around 20 seconds)
 # used in some script reporting for "be patient" messages as well as potentially