espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: ttfw: Encode serial port data to whatever the console encoding is

Browse Source 
This is a bit of a hack, but gives us a way to always log it
This commit is contained in:
Angus Gratton
2020-11-24 18:32:09 +11:00
parent 0aca88a6e9
commit a85b97a6f5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/tiny-test-fw/DUT.py
View File

@ -40,6 +40,7 @@ If they using different port then need to implement their DUTPort class as well.
from __future__ import print_function from __future__ import print_function
import time import time
import re import re
import sys
import threading import threading
import copy import copy
import functools import functools
@ -78,11 +79,15 @@ def _expect_lock(func):
def _decode_data(data): def _decode_data(data):
""" for python3, if the data is bytes, then decode it to string """ """ for python3, if the data is bytes, then decode it to string """
if isinstance(data, bytes): if isinstance(data, bytes):
# convert bytes to string # convert bytes to string. This is a bit of a hack, we know that we want to log this
# later so encode to the stdout encoding with backslash escapes for anything non-encodable
out_enc = sys.stdout.encoding
if out_enc is None:
out_enc = 'ascii'
try: try:
data = data.decode("utf-8", "ignore") return data.decode(out_enc, "backslashreplace")
except UnicodeDecodeError: except (UnicodeDecodeError, TypeError): # Python <3.5 doesn't support backslashreplace
data = data.decode("iso8859-1", ) return data.decode(out_enc, "replace")
return data return data