[Debug] Add automatic device attribute dump on composition test failures

src/python_testing/TC_DeviceBasicComposition.py

@@ -189,7 +189,7 @@
 from matter.clusters.Types import Nullable
 from matter.exceptions import ChipStackError
 from matter.interaction_model import InteractionModelError, Status
-from matter.testing.basic_composition import BasicCompositionTests
+from matter.testing.basic_composition import BasicCompositionTests, log_structured_data
 from matter.testing.global_attribute_ids import (AttributeIdType, ClusterIdType, CommandIdType, GlobalAttributeIds,
                                                  attribute_id_type, cluster_id_type, command_id_type)
 from matter.testing.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
@@ -965,13 +965,6 @@ def test_TC_IDM_12_1(self):
         json_str, txt_str = self.dump_wildcard(dump_device_composition_path)
 
         # Structured dump so we can pull these back out of the logs
-        def log_structured_data(start_tag: str, dump_string):
-            lines = dump_string.splitlines()
-            logging.info(f'{start_tag}BEGIN ({len(lines)} lines)====')
-            for line in lines:
-                logging.info(f'{start_tag}{line}')
-            logging.info(f'{start_tag}END ====')
-
         log_structured_data('==== json: ', json_str)
         log_structured_data('==== txt: ', txt_str)
 

src/python_testing/TC_DeviceConformance.py

@@ -36,10 +36,11 @@
 # === END CI TEST ARGUMENTS ===
 
 # TODO: Enable 10.5 in CI once the door lock OTA requestor problem is sorted.
+import logging
 from typing import Callable
 
 import matter.clusters as Clusters
-from matter.testing.basic_composition import BasicCompositionTests
+from matter.testing.basic_composition import BasicCompositionTests, log_structured_data
 from matter.testing.choice_conformance import (evaluate_attribute_choice_conformance, evaluate_command_choice_conformance,
                                                evaluate_feature_choice_conformance)
 from matter.testing.conformance import conformance_allowed

src/python_testing/matter_testing_infrastructure/matter/testing/basic_composition.py

@@ -39,6 +39,23 @@
 from matter.testing.spec_parsing import PrebuiltDataModelDirectory, build_xml_clusters, build_xml_device_types, dm_from_spec_version
 
 
+def log_structured_data(start_tag: str, dump_string: str):
+    """Log structured data with a clear start and end marker.
+
+    This function is used to output device attribute dumps and other structured 
+    data to logs in a format that can be easily extracted for debugging.
+
+    Args:
+        start_tag: A prefix tag to identify the type of data being logged
+        dump_string: The data to be logged
+    """
+    lines = dump_string.splitlines()
+    logging.info(f'{start_tag}BEGIN ({len(lines)} lines)====')
+    for line in lines:
+        logging.info(f'{start_tag}{line}')
+    logging.info(f'{start_tag}END ====')
+
+
 @dataclass
 class ArlData:
     have_arl: bool
@@ -276,3 +293,22 @@ def build_spec_xmls(self):
         self.xml_clusters, self.problems = build_xml_clusters(dm)
         self.xml_device_types, problems = build_xml_device_types(dm)
         self.problems.extend(problems)
+
+    def on_fail(self, record):
+        """Override on_fail to automatically dump device data when any composition test fails.
+
+        This ensures that whenever any test inheriting from BasicCompositionTests fails,
+        we automatically get the device attribute dump for debugging purposes.
+        """
+        # Call the parent on_fail method first (this will be MatterBaseTest.on_fail)
+        super().on_fail(record)
+
+        # Dump device composition data if available for debugging
+        try:
+            if hasattr(self, 'endpoints_tlv') and self.endpoints_tlv:
+                json_str, txt_str = self.dump_wildcard(None)  # Don't write to file, just get strings
+                log_structured_data('==== FAILURE_DUMP_json: ', json_str)
+                log_structured_data('==== FAILURE_DUMP_txt: ', txt_str)
+        except Exception as e:
+            # Don't let logging errors interfere with the original test failure
+            logging.warning(f"Failed to dump device data on test failure: {e}")