From 8e266094f9bb31e444f90263119389d857d1001e Mon Sep 17 00:00:00 2001
From: Eddie Arrage <eddie.arrage@huawei.com>
Date: Fri, 9 Feb 2018 15:52:21 -0800
Subject: Add stop on failure logic and CLI option

- Improve test execution control by adding stop on failure flag
- Modify test check function to return value regardless of whether
report or local file option is employed
- Modify run test loop to check for failure after every test case
if stop flag set

Change-Id: I27a4f3aaaa8b8cb8c52eb3f092f52048980abb44
Signed-off-by: Eddie Arrage <eddie.arrage@huawei.com>
---
 dovetail/conf/cmd_config.yml |  6 ++++++
 dovetail/run.py              | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index 03455be1..2ae40df7 100644
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -53,6 +53,12 @@ cli:
           - '-d'
         is_flag: 'True'
         help: 'Flag for showing debug log on screen.'
+      stop:
+        flags:
+          - '--stop'
+          - '-s'
+        is_flag: 'True'
+        help: 'Flag for stopping on test case failure.'
       report:
         flags:
           - '--report'
diff --git a/dovetail/run.py b/dovetail/run.py
index 8b29fbab..cddf22ef 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -39,7 +39,7 @@ def load_testcase():
     Testcase.load()
 
 
-def run_test(testsuite, testarea, logger):
+def run_test(testsuite, testarea, logger, kwargs):
     testcase_list = Testcase.get_testcase_list(testsuite, testarea)
     duration = 0
     start_time = time.time()
@@ -61,7 +61,9 @@ def run_test(testsuite, testarea, logger):
         if run_testcase:
             testcase.run()
 
-        check_tc_result(testcase, logger)
+        stop_on_fail = check_tc_result(testcase, logger)
+        if stop_on_fail['criteria'] == "FAIL" and kwargs['stop']:
+            return "stop_on_fail"
 
     end_time = time.time()
     duration = end_time - start_time
@@ -99,8 +101,9 @@ def check_tc_result(testcase, logger):
         else:
             logger.error(
                 "Failed to store results with file {}.".format(result_file))
-        result = Report.get_result(testcase)
-        Report.check_result(testcase, result)
+    result = Report.get_result(testcase)
+    Report.check_result(testcase, result)
+    return result
 
 
 def validate_input(input_dict, check_dict, logger):
@@ -298,10 +301,12 @@ def main(*args, **kwargs):
     if testsuite_validation and testarea_validation:
         testsuite_yaml = load_testsuite(kwargs['testsuite'])
         load_testcase()
-        duration = run_test(testsuite_yaml, testarea, logger)
-        if dt_cfg.dovetail_config['report_dest'] == "file":
+        duration = run_test(testsuite_yaml, testarea, logger, kwargs)
+        if (dt_cfg.dovetail_config['report_dest'] == "file" and
+                duration != "stop_on_fail"):
             Report.generate(testsuite_yaml, testarea, duration)
-        if dt_cfg.dovetail_config['report_dest'].startswith("http"):
+        if (dt_cfg.dovetail_config['report_dest'].startswith("http") and
+                duration != "stop_on_fail"):
             Report.save_logs()
     else:
         logger.error('Invalid input commands, testsuite {} testarea {}'
-- 
cgit 1.2.3-korg