diff options
author | Cedric Ollivier <ollivier.cedric@gmail.com> | 2016-10-17 07:10:10 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-10-17 07:10:10 +0000 |
commit | 288da283a86007af01c2e71296f8230f6fce07e5 (patch) | |
tree | 40ea0979206ac91ad31158d62e0f3473ebcaaae4 /utils | |
parent | 91acddf71dc4fc48506dddc95621705cbe94ffaf (diff) | |
parent | 6aa929cd8c8a9116c8df23bc0bf4cc76516425e6 (diff) |
Merge "Remove exit() in ft_utils.execute_command"
Diffstat (limited to 'utils')
-rw-r--r-- | utils/functest_utils.py | 4 |
1 files changed, 1 insertions, 3 deletions
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 |