aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/OpenStack
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-08-31 15:33:56 +0200
committerJose Lausuch <jose.lausuch@ericsson.com>2016-08-31 14:41:39 +0000
commit8bfe49ee5a6d7b93b3ce7fb6aae0072acb1171d9 (patch)
tree4e410754fe09d6ab6e04c43b42724e69b20df2da /testcases/OpenStack
parentfe5d0f8628b8e0defdfc6e3b0e4556b46311a2f9 (diff)
Remove all logers as utils method args.
As it modifies method params, it could break the testcases. JIRA: FUNCTEST-428 Change-Id: I4263d9bd812f1803e513464e3c321cc4a7281958 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'testcases/OpenStack')
-rwxr-xr-xtestcases/OpenStack/rally/run_rally-cert.py2
-rwxr-xr-xtestcases/OpenStack/tempest/gen_tempest_conf.py2
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py7
-rw-r--r--testcases/OpenStack/vPing/vping_util.py1
4 files changed, 4 insertions, 8 deletions
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'],