From a7d390f6a5d05cb632d933c03f170b5bc25be534 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Wed, 31 Aug 2016 15:33:56 +0200 Subject: Remove all logers as utils method args. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As it modifies method params, it could break the testcases. JIRA: FUNCTEST-428 Conflicts: testcases/features/copper.py testcases/features/doctor.py testcases/features/domino.py Change-Id: I4263d9bd812f1803e513464e3c321cc4a7281958 Signed-off-by: Cédric Ollivier (cherry picked from commit 8bfe49ee5a6d7b93b3ce7fb6aae0072acb1171d9) --- ci/prepare_env.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ci') diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 0b528cfb3..49dcdd505 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -222,7 +222,7 @@ def install_rally(): logger.info("Creating Rally environment...") cmd = "rally deployment destroy opnfv-rally" - ft_utils.execute_command(cmd, logger=logger, exit_on_error=False, + ft_utils.execute_command(cmd, exit_on_error=False, error_msg=("Deployment %s does not exist." % DEPLOYMENT_MAME), verbose=False) rally_conf = os_utils.get_credentials_for_rally() @@ -230,27 +230,27 @@ def install_rally(): json.dump(rally_conf, fp) cmd = "rally deployment create --file=rally_conf.json --name=" cmd += DEPLOYMENT_MAME - ft_utils.execute_command(cmd, logger, + ft_utils.execute_command(cmd, error_msg="Problem creating Rally deployment") logger.info("Installing tempest from existing repo...") cmd = ("rally verify install --source " + TEMPEST_REPO_DIR + " --system-wide") - ft_utils.execute_command(cmd, logger, + ft_utils.execute_command(cmd, error_msg="Problem installing Tempest.") cmd = "rally deployment check" - ft_utils.execute_command(cmd, logger, + ft_utils.execute_command(cmd, error_msg=("OpenStack not responding or " "faulty Rally deployment.")) cmd = "rally show images" - ft_utils.execute_command(cmd, logger, + ft_utils.execute_command(cmd, error_msg=("Problem while listing " "OpenStack images.")) cmd = "rally show flavors" - ft_utils.execute_command(cmd, logger, + ft_utils.execute_command(cmd, error_msg=("Problem while showing " "OpenStack flavors.")) -- cgit 1.2.3-korg