Merge pull request #52 from espressif/fix/improve_log

Fix/improve log

Author: hfudev

pytest-embedded-serial/pytest_embedded_serial/serial.py

@@ -60,23 +60,9 @@ def _start(self):
         pass
 
     def _forward_io(self, pexpect_proc: PexpectProcess) -> None:
-        rest = b''
         while self.proc.is_open:
             try:
-                s = self.proc.read_until()
-                s = rest + s
-
-                res = s.rsplit(b'\n', maxsplit=1)
-                if len(res) == 1:
-                    rest = s
-                else:
-                    s = res[0]
-                    rest = res[1]
-                    if s:
-                        pexpect_proc.write(s + b'\n')
+                s = self.proc.read_all()
+                pexpect_proc.write(s)
             except:  # noqa daemon thread may run at any case
-                try:
-                    pexpect_proc.write(rest)  # try to write the rest of line
-                except:  # noqa daemon thread may run at any case
-                    pass
                 break

pytest-embedded/pytest_embedded/log.py

@@ -49,6 +49,8 @@ def __init__(
         self._with_timestamp = with_timestamp
         self._write_lock = threading.Lock()
 
+        self._added_prefix = False
+
     def send(self, s: AnyStr) -> int:
         """
         Write to the pexpect process and log.
@@ -68,13 +70,24 @@ def send(self, s: AnyStr) -> int:
         # for pytest logging
         _temp = sys.stdout
         sys.stdout = self.STDOUT  # ensure the following print uses system sys.stdout
-        for line in to_str(s).replace('\r', '\n').split('\n'):
-            if line.strip():
-                if self.source:
-                    line = f'[{self.source}] {line}'
-                if self._with_timestamp:
-                    line = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') + ' ' + line
-                print(line)
+
+        _s = to_str(s)
+        prefix = ''
+        if self.source:
+            prefix = f'[{self.source}] ' + prefix
+        if self._with_timestamp:
+            prefix = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') + ' ' + prefix
+
+        if not self._added_prefix:
+            _s = prefix + _s
+            self._added_prefix = True
+        _s = _s.replace('\n', '\n' + prefix)
+        if _s.endswith(prefix):
+            _s = _s.rsplit(prefix, maxsplit=1)[0]
+            self._added_prefix = False
+
+        sys.stdout.write(_s)
+        sys.stdout.flush()
         sys.stdout = _temp
 
         # write the bytes into the pexpect process

pytest-embedded/pytest_embedded/plugin.py

@@ -319,7 +319,7 @@ def _close_or_terminate(obj):
                         current_kwargs[k] = getter(v)
                     else:
                         current_kwargs[k] = v
-                if func.__name__ == '_pexpect_logfile':
+                if func.__name__ in ['_pexpect_logfile', 'pexpect_proc']:
                     current_kwargs['count'] = i
                     current_kwargs['total'] = _COUNT
                 res.append(func(*args, **current_kwargs))