Skip to content

fix(serial): during auto-reconnect, update all pySerial references (CII-181) #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ofacklam wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(serial): during auto-reconnect, update all pySerial references (CII-181) #416

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions pytest-embedded-serial/pytest_embedded_serial/serial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def start_redirect_thread(self) -> None:

# Here the reason why we're still using thread is,
# the `pyserial` object can't be pickled when using multiprocessing.Process
self._redirect_thread = _SerialRedirectThread(self._q, self.proc)
self._redirect_thread = _SerialRedirectThread(self._q, self)
self._redirect_thread.start()

def stop_redirect_thread(self) -> bool:
Expand Down Expand Up @@ -168,7 +168,7 @@ class _SerialRedirectThread(threading.Thread):
Redirect serial thread
"""

def __init__(self, msg_queue: MessageQueue, s: pyserial.Serial):
def __init__(self, msg_queue: MessageQueue, s: Serial):
self._q = msg_queue
self._event_q = multiprocessing.Queue()
self._s = s
Expand Down Expand Up @@ -196,22 +196,22 @@ def _event_loop(self):
continue

try:
s = self._s.read_all()
s = self._s.proc.read_all()
except OSError as e:
logging.error(f'OSError detected: {e}. Serial connection may be lost.')
if self._s.closed:
if self._s.proc.closed:
logging.error('Serial port is already closed. Exiting event loop.')
return

port = self._s.port
port = self._s.proc.port
port_config = {
'baudrate': self._s.baudrate,
'bytesize': self._s.bytesize,
'parity': self._s.parity,
'stopbits': self._s.stopbits,
'timeout': self._s.timeout,
'xonxoff': self._s.xonxoff,
'rtscts': self._s.rtscts,
'baudrate': self._s.proc.baudrate,
'bytesize': self._s.proc.bytesize,
'parity': self._s.proc.parity,
'stopbits': self._s.proc.stopbits,
'timeout': self._s.proc.timeout,
'xonxoff': self._s.proc.xonxoff,
'rtscts': self._s.proc.rtscts,
}
for attempt in range(1, 4):
delay = attempt * 1.5
Expand All @@ -220,8 +220,8 @@ def _event_loop(self):
)
time.sleep(delay)
try:
self._s.close()
self._s = pyserial.serial_for_url(port, **port_config)
self._s.proc.close()
self._s.proc = pyserial.serial_for_url(port, **port_config)
logging.info(f'Successfully reconnected to serial port {port}.')
break
except Exception as e:
Expand Down