From 9290fed4a7503367dc1eda024d2cdeabd50157d4 Mon Sep 17 00:00:00 2001 From: Morgan Richomme Date: Fri, 27 May 2016 10:24:31 +0200 Subject: bug fix: if all tests passed failed could be empty consider failed only if regex match JIRA: FUNCTEST-234 Change-Id: Ie9d29c7bc1eb2f051600d689133b47bf276bc856 Signed-off-by: Morgan Richomme --- testcases/features/bgpvpn.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/testcases/features/bgpvpn.py b/testcases/features/bgpvpn.py index 03aecbb3..11554ab1 100644 --- a/testcases/features/bgpvpn.py +++ b/testcases/features/bgpvpn.py @@ -82,7 +82,8 @@ def main(): tests = m.group(1) # Look for tests failed m = re.search('Failed:(.*)', output) - failed = m.group(1) + if m is not None: + failed = m.group(1) except: logger.error("Impossible to parse the result file") @@ -93,9 +94,7 @@ def main(): "errors": error_logs} logger.info("Results: " + str(json_results)) - criteria = "failed" - if int(tests) > 0 and int(failed) < 1: - criteria = "passed" + # Push results in payload of testcase if args.report: logger.debug("Push result into DB") @@ -104,6 +103,9 @@ def main(): version = ft_utils.get_version(logger) pod_name = ft_utils.get_pod_name(logger) build_tag = ft_utils.get_build_tag(logger) + criteria = "failed" + if int(tests) > 0 and int(failed) < 1: + criteria = "passed" ft_utils.push_results_to_db(url, "sdnvpn", "bgpvpn_api", logger, pod_name, version, scenario, criteria, -- cgit 1.2.3-korg