From 754de03cbd57ecd4132c0d24fc26ab52ed114e5c Mon Sep 17 00:00:00 2001 From: liukunmo Date: Thu, 13 May 2021 20:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E4=B8=AD?= =?UTF-8?q?=E7=A9=BA=E8=A1=8C=E9=80=A0=E6=88=90=E7=94=A8=E4=BE=8B=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/xdevice/_core/driver/parser_lite.py | 3 +-- src/xdevice/_core/environment/dmlib_lite.py | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/xdevice/_core/driver/parser_lite.py b/src/xdevice/_core/driver/parser_lite.py index db5c52f..566b7dd 100755 --- a/src/xdevice/_core/driver/parser_lite.py +++ b/src/xdevice/_core/driver/parser_lite.py @@ -622,8 +622,7 @@ class CTestParser(IParser): except AttributeError: LOG.error("parsing log: %s failed" % (line.strip()), error_no="00405") - if line and line.strip(): - self.last_line = line + self.last_line = line def _parse_product_info(self, line): if _PRODUCT_PARA_START in line: diff --git a/src/xdevice/_core/environment/dmlib_lite.py b/src/xdevice/_core/environment/dmlib_lite.py index c1e29c0..123c41d 100755 --- a/src/xdevice/_core/environment/dmlib_lite.py +++ b/src/xdevice/_core/environment/dmlib_lite.py @@ -228,17 +228,18 @@ class LiteHelper: data = com.readline().decode('gbk', errors='ignore') data = PATTERN.sub('', data) if isinstance(input_command, list): - data = "{} {}".format(get_current_time(), data) - if data and receiver: - receiver.__read__(data.replace("\r", "")) - result = "{}{}".format(result, data.replace("\r", "")) - if re.search(r"\d+\s+Tests\s+\d+\s+Failures\s+\d+\s+" - r"Ignored", data): - start = time.time() + if len(data.strip()) > 0: + data = "{} {}".format(get_current_time(), data) + if data and receiver: + receiver.__read__(data.replace("\r", "")) + result = "{}{}".format(result, data.replace("\r", "")) + if re.search(r"\d+\s+Tests\s+\d+\s+Failures\s+\d+\s+" + r"Ignored", data): + start = time.time() + if CTEST_END_SIGN in data: + break if (int(time.time()) - int(start)) > timeout: break - if CTEST_END_SIGN in data: - break else: result = "{}{}".format( result, data.replace("\r", "").replace("\n", "").strip())