fix: Improve stability of test_zb_sleep and test_zb_basic

Author: Ww19960307

examples/pytest_esp_zigbee_open_examples.py

@@ -46,28 +46,30 @@ def test_zb_basic(dut, count, app_path, erase_all):
     server = ExampleDevice(dut[1])
 
     Common.check_zigbee_network_status(client, server)
-    status_value, address_value, endpoint_value = client.get_match_desc_response_values()
+    logs = str(client.dut.expect(r"Received report information: attribute\(0x0\), type\(0x10\), value\(0\)", timeout=15, return_what_before_match=True))
+
+    status_value, address_value, endpoint_value = client.get_match_desc_response_values(logs=logs)
     assert status_value == address_value == '0'
     assert endpoint_value == '10'
 
-    status_value, endpoint_count_value = client.get_active_endpoint_response_values()
+    status_value, endpoint_count_value = client.get_active_endpoint_response_values(logs=logs)
     assert status_value == '0'
     # release/v1.0.8 change endpoint_count to 2
     assert endpoint_count_value == '2'
 
     status_value, device_id_value, app_version_value, profile_id_value, endpoint_id_value = \
-        client.get_simple_desc_response_values()
+        client.get_simple_desc_response_values(logs=logs)
 
     assert status_value == app_version_value == '0'
     assert device_id_value == '256'
     assert profile_id_value == '104'
     assert endpoint_id_value == '10'
 
-    address_value, endpoint_value, status_value = client.get_bind_response_values()
+    address_value, endpoint_value, status_value = client.get_bind_response_values(logs=logs)
     assert address_value == status_value == '0'
     assert endpoint_value == '1'
 
-    address, src_endpoint, dst_endpoint, cluster = client.get_received_report_values()
+    address, src_endpoint, dst_endpoint, cluster = client.get_received_report_values(logs=logs)
     assert address == '0'
     assert src_endpoint == '10'
     assert dst_endpoint == '1'

examples/zigbee_common.py

@@ -8,6 +8,7 @@
 from functools import wraps
 import logging
 from constants import MatchPattern
+import re
 
 logging.basicConfig(level=logging.INFO)
 
@@ -16,7 +17,11 @@ def expect_decorator(pattern):
     def decorator(func):
         @wraps(func)
         def wrapper(self, *args, **kwargs):
-            match_result = self.dut.expect(pattern, timeout=5)
+            logs = kwargs.pop("logs", None)
+            if logs is not None:
+                match_result = re.compile(pattern).search(logs)
+            else:
+                match_result = self.dut.expect(pattern, timeout=5)
             if not match_result:
                 assert False, f"No match found for pattern: {pattern}"
             matched_groups = match_result.groups()
@@ -78,7 +83,7 @@ def get_ota_receives_data(self, matched_values):
         logging.info(f"progress: {progress}, total: {total}")
         return matched_values
 
-    @expect_decorator(r'status\((\d+)\) and endpoint count\((\d+)\)')
+    @expect_decorator(r"status\((\d+)\) and endpoint count\((\d+)\)")
     def get_active_endpoint_response_values(self, matched_values):
         status_value, endpoint_count_value = matched_values
         logging.info(f"Status: {status_value}, Endpoint Count: {endpoint_count_value}")
@@ -204,7 +209,7 @@ def zcl_send_gen_and_check(self, cmd, source_ep, cluster, short_address='', dst_
         comm += f' -d {short_address}' if short_address else ''
         comm += f' --dst-ep {dst_ep}' if dst_ep else ''
         self.dut.write(comm)
-        self.dut.expect(r'Receive Zigbee action\(0x[0-9A-Fa-f]+\) callback', timeout=1)
+        self.dut.expect(r'Receive Zigbee action\(0x[0-9A-Fa-f]+\) callback', timeout=6)
 
     def zcl_send_raw_and_check(self, source_ep, cluster, cmd, short_address='', dst_ep='', payload=''):
         comm = f'zcl send_raw -e {source_ep} -c {cluster} --cmd {cmd}'