From 8bfe49ee5a6d7b93b3ce7fb6aae0072acb1171d9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier 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 Change-Id: I4263d9bd812f1803e513464e3c321cc4a7281958 Signed-off-by: Cédric Ollivier --- testcases/OpenStack/rally/run_rally-cert.py | 2 -- testcases/OpenStack/tempest/gen_tempest_conf.py | 2 +- testcases/OpenStack/tempest/run_tempest.py | 7 +++---- testcases/OpenStack/vPing/vping_util.py | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'testcases/OpenStack') diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py index f3eb79d2..f7199d30 100755 --- a/testcases/OpenStack/rally/run_rally-cert.py +++ b/testcases/OpenStack/rally/run_rally-cert.py @@ -362,7 +362,6 @@ def run_task(test_name): logger.debug("Push Rally detailed results into DB") functest_utils.push_results_to_db("functest", "Rally_details", - logger, start_time, stop_time, status, @@ -495,7 +494,6 @@ def main(): logger.debug("Pushing Rally summary into DB...") functest_utils.push_results_to_db("functest", case_name, - logger, start_time, stop_time, status, diff --git a/testcases/OpenStack/tempest/gen_tempest_conf.py b/testcases/OpenStack/tempest/gen_tempest_conf.py index 4aa814a5..688a9240 100755 --- a/testcases/OpenStack/tempest/gen_tempest_conf.py +++ b/testcases/OpenStack/tempest/gen_tempest_conf.py @@ -116,7 +116,7 @@ def main(): if not os.path.exists(TEMPEST_RESULTS_DIR): os.makedirs(TEMPEST_RESULTS_DIR) - deployment_dir = ft_utils.get_deployment_dir(logger) + deployment_dir = ft_utils.get_deployment_dir() configure_tempest_multisite(deployment_dir) diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 306664fe..9285b67d 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -166,7 +166,7 @@ def configure_tempest(deployment_dir): logger.debug("Generating new tempest.conf file...") cmd = "rally verify genconfig" - ft_utils.execute_command(cmd, logger) + ft_utils.execute_command(cmd) logger.debug("Finding tempest.conf file...") if not os.path.isfile(tempest_conf_file): @@ -228,7 +228,7 @@ def generate_test_list(deployment_dir, mode): testr_mode = 'tempest.api.' + mode cmd = ("cd " + deployment_dir + ";" + "testr list-tests " + testr_mode + ">" + TEMPEST_RAW_LIST + ";cd") - ft_utils.execute_command(cmd, logger) + ft_utils.execute_command(cmd) def apply_tempest_blacklist(): @@ -373,7 +373,6 @@ def run_tempest(OPTION): try: ft_utils.push_results_to_db("functest", case_name, - None, start_time, stop_time, status, @@ -399,7 +398,7 @@ def main(): if not os.path.exists(TEMPEST_RESULTS_DIR): os.makedirs(TEMPEST_RESULTS_DIR) - deployment_dir = ft_utils.get_deployment_dir(logger) + deployment_dir = ft_utils.get_deployment_dir() create_tempest_resources() if "" == args.conf: diff --git a/testcases/OpenStack/vPing/vping_util.py b/testcases/OpenStack/vPing/vping_util.py index 3f4adae7..9c35c230 100644 --- a/testcases/OpenStack/vPing/vping_util.py +++ b/testcases/OpenStack/vPing/vping_util.py @@ -456,7 +456,6 @@ def push_result(report, case, start_time, stop_time, details): logger.debug("Pushing vPing %s results into DB..." % case) ft_utils.push_results_to_db('functest', case, - logger, start_time, stop_time, details['status'], -- cgit 1.2.3-korg