diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2016-10-12 17:25:21 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2016-10-12 17:28:07 +0200 |
| commit | 6aa929cd8c8a9116c8df23bc0bf4cc76516425e6 (patch) | |
| tree | 9f08736ad1e011aace3863818f6f4f093330244a /ci | |
| parent | ab3b723d2cc6c16b11c3a17b091da384213bcaac (diff) | |
Remove exit() in ft_utils.execute_command
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 <cedric.ollivier@orange.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.py | 2 | ||||
| -rwxr-xr-x | ci/run_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
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() |