testing/esp: fixes to enable uart logging in CI

Author: sobuch

testing/esp/run_tests.py

@@ -205,6 +205,7 @@ def is_connected(self):
     def start(self):
         self.ser.open()
         self.do_work = True
+        self.paused = False
         threading.Thread.start(self)
 
     def stop(self):
@@ -214,14 +215,24 @@ def stop(self):
         self.ser.close()
         self._logger.debug('Reader thread to finished')
 
+    def pause(self):
+        self.paused = True
+
+    def resume(self):
+        self.paused = False
+
     def run(self):
         self._logger.debug('Start reading from "{}"'.format(self.ser.name))
         line = b''
         while self.do_work:
-            line += self.ser.read(1)
-            if line.endswith(b'\n'):
-                self._logger.info(line.rstrip(b'\r\n'))
-                line = b''
+            if not self.paused:
+                try:
+                    line += self.ser.read(1)
+                except serial.SerialException:
+                    line += b'<exc>'
+                if line.endswith(b'\n'):
+                    self._logger.info(line.rstrip(b'\r\n'))
+                    line = b''
 
 
 def dbg_start(toolchain, oocd, oocd_tcl, oocd_cfg_files, oocd_cfg_cmds, debug_oocd,
@@ -358,6 +369,7 @@ def main():
     if board_uart_reader:
         setup_logger(board_uart_reader.get_logger(), ch, fh, log_lev)
         board_uart_reader.start()
+        time.sleep(1)
     board_tcl = BOARD_TCL_CONFIG[args.board_type]
     board_tcl['commands'] = args.oocd_cmds.split(",")
 

testing/esp/test_special.py

@@ -56,15 +56,18 @@ def test_debugging_works_after_hw_reset(self):
             5) Wait some time.
             6) Run simple debug session.
         """
-        # avoid simultaneous access to UART with SerialReader
-        self.assertIsNone(self.uart_reader, "Can not run this test with UART logging enabled!")
         self.select_sub_test("blink")
         self.resume_exec()
         time.sleep(2.0)
         assert self.port_name is not None
+        # avoid simultaneous access to UART with SerialReader
+        if self.uart_reader:
+            self.uart_reader.pause()
         cmd = ['esptool.py', '-p', self.port_name, '--no-stub', 'chip_id']
         proc = subprocess.run(cmd)
         proc.check_returncode()
+        if self.uart_reader:
+            self.uart_reader.resume()
         time.sleep(2.0)
         self.stop_exec()
         self.prepare_app_for_debugging(self.test_app_cfg.app_off)
@@ -262,18 +265,21 @@ def test_cores_states_after_esptool_connection(self):
             5) Wait some time.
             6) Check that all targets are in state 'running'.
         """
-        # avoid simultaneous access to UART with SerialReader
-        self.assertIsNone(self.uart_reader, "Can not run this test with UART logging enabled!")
         self.select_sub_test("blink")
         self.resume_exec()
         time.sleep(2.0)
         for target in self.oocd.targets():
             state = self.oocd.target_state(target)
             self.assertEqual(state, 'running')
         assert self.port_name is not None
+        # avoid simultaneous access to UART with SerialReader
+        if self.uart_reader:
+            self.uart_reader.pause()
         cmd = ['esptool.py', '-p', self.port_name, '--no-stub', 'chip_id']
         proc = subprocess.run(cmd)
         proc.check_returncode()
+        if self.uart_reader:
+            self.uart_reader.resume()
         time.sleep(2.0)
         for target in self.oocd.targets():
             state = self.oocd.target_state(target)