提交 754de03c 编写于 作者: L liukunmo

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

上级 1c3c65d2
...@@ -622,8 +622,7 @@ class CTestParser(IParser): ...@@ -622,8 +622,7 @@ class CTestParser(IParser):
except AttributeError: except AttributeError:
LOG.error("parsing log: %s failed" % (line.strip()), LOG.error("parsing log: %s failed" % (line.strip()),
error_no="00405") error_no="00405")
if line and line.strip(): self.last_line = line
self.last_line = line
def _parse_product_info(self, line): def _parse_product_info(self, line):
if _PRODUCT_PARA_START in line: if _PRODUCT_PARA_START in line:
......
...@@ -228,17 +228,18 @@ class LiteHelper: ...@@ -228,17 +228,18 @@ class LiteHelper:
data = com.readline().decode('gbk', errors='ignore') data = com.readline().decode('gbk', errors='ignore')
data = PATTERN.sub('', data) data = PATTERN.sub('', data)
if isinstance(input_command, list): if isinstance(input_command, list):
data = "{} {}".format(get_current_time(), data) if len(data.strip()) > 0:
if data and receiver: data = "{} {}".format(get_current_time(), data)
receiver.__read__(data.replace("\r", "")) if data and receiver:
result = "{}{}".format(result, data.replace("\r", "")) receiver.__read__(data.replace("\r", ""))
if re.search(r"\d+\s+Tests\s+\d+\s+Failures\s+\d+\s+" result = "{}{}".format(result, data.replace("\r", ""))
r"Ignored", data): if re.search(r"\d+\s+Tests\s+\d+\s+Failures\s+\d+\s+"
start = time.time() r"Ignored", data):
start = time.time()
if CTEST_END_SIGN in data:
break
if (int(time.time()) - int(start)) > timeout: if (int(time.time()) - int(start)) > timeout:
break break
if CTEST_END_SIGN in data:
break
else: else:
result = "{}{}".format( result = "{}{}".format(
result, data.replace("\r", "").replace("\n", "").strip()) result, data.replace("\r", "").replace("\n", "").strip())
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册