From 37cbf88c26866db4dc180e33fccac59abc1fa586 Mon Sep 17 00:00:00 2001 From: xudan Date: Sat, 22 Apr 2017 04:00:51 +0000 Subject: Bugfix about the ipv6 results checker JIRA: DOVETAIL-404 1. IPV6 sub-testcase's name includes [id], which will affects the regex. 2. Remove the [id] from the name of the sub_testcases. Change-Id: I51b567e8382fa4e701f8b32ba7ea195d49fd31eb Signed-off-by: xudan --- dovetail/report.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dovetail/report.py b/dovetail/report.py index c7eff3d2..c51ce687 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -386,9 +386,15 @@ class FunctestChecker(object): def get_sub_testcase(sub_testcase, result): if not result: return False + sub_testcase = re.sub("\[.*?\]", "", sub_testcase) reg = sub_testcase + '[\s+\d+]' find_reg = re.compile(reg) match = find_reg.findall(result) + if match: + return True + reg = sub_testcase + '$' + find_reg = re.compile(reg) + match = find_reg.findall(result) if match: return True return False -- cgit 1.2.3-korg