From 6aa929cd8c8a9116c8df23bc0bf4cc76516425e6 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Wed, 12 Oct 2016 17:25:21 +0200 Subject: Remove exit() in ft_utils.execute_command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It simply removes the exit call in ft_utils.execute_command which is quite safe as every testcase sets exit_on_error to False JIRA: FUNCTEST-438 Change-Id: Ia273de0955cc3ea65a150c626638400ce614da00 Signed-off-by: Cédric Ollivier --- utils/functest_utils.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'utils/functest_utils.py') diff --git a/utils/functest_utils.py b/utils/functest_utils.py index 717e4b2c..ef865bed 100644 --- a/utils/functest_utils.py +++ b/utils/functest_utils.py @@ -289,7 +289,7 @@ def get_ci_envvars(): return ci_env_var -def execute_command(cmd, exit_on_error=True, info=False, error_msg="", +def execute_command(cmd, info=False, error_msg="", verbose=True, output_file=None): if not error_msg: error_msg = ("The command '%s' failed." % cmd) @@ -317,8 +317,6 @@ def execute_command(cmd, exit_on_error=True, info=False, error_msg="", if returncode != 0: if verbose: logger.error(error_msg) - if exit_on_error: - sys.exit(1) return returncode -- cgit 1.2.3-korg