openharmony/testfwk_xdevice
1
0
Fork 0
mirror of https://gitee.com/openharmony/testfwk_xdevice synced 2024-12-03 13:12:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!19 修复日志中空行造成用例结果判断错误的问题

Browse Source 
Merge pull request !19 from liukunmo/master
This commit is contained in:
openharmony_ci 2021-05-13 21:05:05 +08:00 committed by Gitee
commit fe14c87b60
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xdevice/_core/driver/parser_lite.py
View File

@ -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:

19
src/xdevice/_core/environment/dmlib_lite.py
View File

@ -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())