chore: move find_log_message to its only user

This is to keep Microvm trim

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/framework/microvm.py

@@ -11,7 +11,6 @@
 import json
 import logging
 import os
-import re
 import select
 import shutil
 import time
@@ -255,7 +254,7 @@ def log_data(self):
         """Return the log data.
 
         !!!!OBS!!!!: Do not use this to check for message existence and
-        rather use self.check_log_message or self.find_log_message.
+        rather use self.check_log_message.
         """
         with data_lock:
             log_data = self.__log_data
@@ -504,13 +503,6 @@ def check_any_log_message(self, messages):
             f"`{messages}` were not found in this log: {self.log_data}"
         )
 
-    @retry(delay=0.1, tries=5)
-    def find_log_message(self, regex):
-        """Wait until `regex` appears in logging output and return it."""
-        reg_res = re.findall(regex, self.log_data)
-        assert reg_res
-        return reg_res
-
     def serial_input(self, input_string):
         """Send a string to the Firecracker serial console via screen."""
         input_cmd = 'screen -S {session} -p 0 -X stuff "{input_string}"'

tests/integration_tests/performance/test_boottime.py

@@ -4,6 +4,7 @@
 
 import platform
 import re
+import time
 
 from framework.properties import global_props
 from framework.utils_cpuid import get_cpu_model_name, get_instance_type
@@ -112,7 +113,12 @@ def test_initrd_boottime(test_microvm_with_initrd, record_property, metrics):
 def _test_microvm_boottime(vm, max_time_us=MAX_BOOT_TIME_US):
     """Auxiliary function for asserting the expected boot time."""
     boot_time_us = 0
-    timestamps = vm.find_log_message(TIMESTAMP_LOG_REGEX)
+    timestamps = []
+    for _ in range(10):
+        timestamps = re.findall(TIMESTAMP_LOG_REGEX, vm.log_data)
+        if timestamps:
+            break
+        time.sleep(0.1)
     if timestamps:
         boot_time_us = int(timestamps[0])