Improve the method of get event number

project-chip · Aug 24, 2023 · 2c4a907 · 2c4a907
1 parent 52aeb83
commit 2c4a907
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/scripts/py_matter_yamltests/matter_yamltests/runner.py b/scripts/py_matter_yamltests/matter_yamltests/runner.py
@@ -14,7 +14,6 @@
 #    limitations under the License.
 
 import asyncio
-import re
 import time
 from abc import ABC, abstractmethod
 from asyncio import CancelledError
@@ -127,7 +126,6 @@ class TestRunner(TestRunnerBase):
     TestRunner is a default runner implementation.
     """
 
-    pattern = re.compile(r'EventNumber = (0x[0-9a-f]+)')
     last_event_number = 0
 
     async def start(self):
@@ -180,8 +178,8 @@ async def _run(self, parser: TestParser, config: TestRunnerConfig):
 
             test_duration = 0
             for idx, request in enumerate(parser.tests):
-                if request.is_last_event_number:
-                    request.event_number = self.last_event_number
+                if request.is_event and request.is_last_event_number:
+                    request.event_number = self.last_event_number + 1
 
                 if not request.is_pics_enabled:
                     hooks.step_skipped(request.label, request.pics)
@@ -203,14 +201,11 @@ async def _run(self, parser: TestParser, config: TestRunnerConfig):
                 duration = round((time.time() - start) * 1000, 2)
                 test_duration += duration
 
-                # TODO: To get the event number, the method could be improved
-                for log in reversed(logs):
-                    match = self.pattern.search(log.message)
-                    if match:
-                        received_event_number = int(match.group(1), 16) + 1
-                        if self.last_event_number < received_event_number:
-                            self.last_event_number = received_event_number
-                        break
+
+                if request.is_event:
+                    received_event_number = responses[-1].get('eventNumber')
+                    if received_event_number and self.last_event_number < received_event_number:
+                        self.last_event_number = received_event_number
 
                 logger = request.post_process_response(responses)