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 --- ci/prepare_env.py | 2 +- ci/run_tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ci') diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 6b1babaa8..e110aa572 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -223,7 +223,7 @@ def install_rally(): logger.info("Creating Rally environment...") cmd = "rally deployment destroy opnfv-rally" - ft_utils.execute_command(cmd, exit_on_error=False, + ft_utils.execute_command(cmd, error_msg=("Deployment %s does not exist." % DEPLOYMENT_MAME), verbose=False) rally_conf = os_utils.get_credentials_for_rally() diff --git a/ci/run_tests.py b/ci/run_tests.py index af8f51dd0..638a6edf3 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -108,7 +108,7 @@ def run_test(test, tier_name): else: cmd = ("%s%s" % (EXEC_SCRIPT, flags)) logger.debug("Executing command '%s'" % cmd) - result = ft_utils.execute_command(cmd, exit_on_error=False) + result = ft_utils.execute_command(cmd) if CLEAN_FLAG: cleanup() -- cgit 1.2.3-korg