check

Author: cecille

src/python_testing/post_certification_tests/post-cert-checks.py

@@ -42,6 +42,7 @@
 import sys
 import time
 import uuid
+from dataclasses import dataclass
 from enum import Enum, auto
 from pathlib import Path
 
@@ -70,10 +71,17 @@
     import fetch_paa_certs_from_dcl
 
 
+@dataclass
+class Failure:
+    test: str
+    step: str
+
+
 class Hooks():
     def __init__(self):
         self.failures = []
         self.current_step = 'unknown'
+        self.current_test = 'unknown'
 
     def start(self, count: int):
         pass
@@ -82,6 +90,7 @@ def stop(self, duration: int):
         pass
 
     def test_start(self, filename: str, name: str, count: int):
+        self.current_test = name
         pass
 
     def test_stop(self, exception: Exception, duration: int):
@@ -97,7 +106,7 @@ def step_success(self, logger, logs, duration: int, request):
         pass
 
     def step_failure(self, logger, logs, duration: int, request, received):
-        self.failures.append(self.current_step)
+        self.failures.append(Failures(self.current_test, self.current_step))
 
     def step_unknown(self):
         pass
@@ -139,41 +148,50 @@ async def setup_class(self):
         self.vid = await self.read_single_attribute_check_success(cluster=bi, attribute=bi.Attributes.VendorID)
         self.pid = await self.read_single_attribute_check_success(cluster=bi, attribute=bi.Attributes.ProductID)
         self.software_version = await self.read_single_attribute_check_success(cluster=bi, attribute=bi.Attributes.SoftwareVersion)
-        self.vid = 0x6006
-        self.pid = 1
-        self.software_version = 1300
 
     def steps_Vendor(self):
         return [TestStep(1, "Check if device VID is listed in the DCL vendor schema", "Listing found")]
 
     def test_Vendor(self):
         self.step(1)
         entry = get_dcl_vendor(self.vid)
-        asserts.assert_true('vendorInfo' in entry.keys(), f"Unable to find vendor entry for {self.vid:04x}")
+        key = 'vendorInfo'
+        asserts.assert_true(key in entry.keys(), f"Unable to find vendor entry for {self.vid:04x}")
+        logging.info(f'Found vendor key 0x{vid:04X} in DCL:')
+        logging.info(f'{entry[key]}')
 
     def steps_Model(self):
         return [TestStep(1, "Check if device VID/PID are listed in the DCL model schema", "Listing found")]
 
     def test_Model(self):
         self.step(1)
+        key = 'model'
         entry = get_dcl_model(self.vid, self.pid)
-        asserts.assert_true('model' in entry.keys(), f"Unable to find model entry for {self.vid:04x} {self.pid:04x}")
+        asserts.assert_true(key in entry.keys(), f"Unable to find model entry for {self.vid:04x} {self.pid:04x}")
+        logging.info(f'Found model entry for vid=0x{vid:04X} pid=0x{pid:04X} in the DCL:')
+        logging.info(f'{entry[key]}')
 
     def steps_Compliance(self):
         return [TestStep(1, "Check if device VID/PID/SoftwareVersion are listed in the DCL compliance info schema", "Listing found")]
 
     def test_Compliance(self):
         self.step(1)
+        key = 'complianceInfo'
         entry = get_dcl_compliance_info(self.vid, self.pid, self.software_version)
-        asserts.assert_true('complianceInfo' in entry.keys(), f"Unable to find compliance entry for {self.vid:04x} {self.pid:04x} {self.software_version}")
+        asserts.assert_true(key in entry.keys(), f"Unable to find compliance entry for {self.vid:04x} {self.pid:04x} {self.software_version}")
+        logging.info(f'Found compliance info for vid=0x{vid:04X} pid=0x{pid:04X} software version={software_version} in the DCL:')
+        logging.info(f'{entry[key]}')
 
     def steps_CertifiedModel(self):
         return [TestStep(1, "Check if device VID/PID/SoftwareVersion are listed in the DCL certified model schema", "Listing found")]
 
     def test_CertifiedModel(self):
         self.step(1)
+        key = 'certifiedModel'
         entry = get_dcl_certified_model(self.vid, self.pid, self.software_version)
-        asserts.assert_true('certifiedModel' in entry.keys(), f"Unable to find certified model entry for {self.vid:04x} {self.pid:04x} {self.software_version}")
+        asserts.assert_true(key in entry.keys(), f"Unable to find certified model entry for {self.vid:04x} {self.pid:04x} {self.software_version}")
+        logging.info(f'Found certified model for vid=0x{vid:04X} pid=0x{pid:04X} software version={software_version} in the DCL:')
+        logging.info(f'{entry[key]}')
 
 
 def get_qr() -> str:
@@ -279,11 +297,11 @@ def __exit__(self, *args):
         shutil.rmtree(self.cd_path)
 
 
-def run_test(test_class: MatterBaseTest, test_name: str, test_config: TestConfig) -> list[str]:
+def run_test(test_class: MatterBaseTest, tests: typing.list[str], test_config: TestConfig) -> list[str]:
     hooks = Hooks()
     stack = test_config.get_stack()
     controller = test_config.get_controller()
-    matter_config = test_config.get_config([test_name])
+    matter_config = test_config.get_config(tests)
     ok = run_tests_no_exit(test_class, matter_config, hooks, controller, stack)
     if not ok:
         print(f"Test failure. Failed on step: {hooks.get_failures()}")
@@ -297,7 +315,7 @@ def run_cert_test(test: str, test_config: TestConfig) -> list[str]:
     # share a name, test is test_classname
     module = importlib.import_module(test)
     test_class = getattr(module, test)
-    return run_test(test_class, f'test_{test}', test_config)
+    return run_test(test_class, [f'test_{test}'], test_config)
 
 
 def main():
@@ -308,22 +326,15 @@ def main():
         # DA-1.7 is a test of the DAC chain (up to a PAA in the given directory)
         failures_DA_1_7 = run_cert_test('TC_DA_1_7', test_config)
 
-        failures_test_event_trigger = run_test(TestEventTriggersCheck, 'test_TestEventTriggersCheck', test_config)
+        failures_test_event_trigger = run_test(TestEventTriggersCheck, ['test_TestEventTriggersCheck'], test_config)
 
-        failures_dcl_vendor = run_test(DclCheck, 'test_Vendor', test_config)
-        failures_dcl_model = run_test(DclCheck, 'test_Model', test_config)
-        failures_dcl_compliance = run_test(DclCheck, 'test_Compliance', test_config)
-        failures_dcl_certified_model = run_test(DclCheck, 'test_CertifiedModel', test_config)
+        failures_dcl = run_test(DclCheck, ['test_Vendor', 'test_Model', 'test_Compliance', 'test_CertifiedModel'], test_config)s
 
-        failures = failures_DA_1_2 + failures_DA_1_7 + failures_test_event_trigger
+        failures = failures_DA_1_2 + failures_DA_1_7 + failures_test_event_trigger + failures_dcl
 
-    print('returning')
     print(failures)
     return 0
 
 
 if __name__ == "__main__":
-    ret = main()
-    print(f'ret = {ret}')
-    if ret != 0:
-        sys.exit(1)
+    sys.exit(main())