From 8bfe49ee5a6d7b93b3ce7fb6aae0072acb1171d9 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
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 <cedric.ollivier@orange.com>
---
testcases/features/copper.py | 5 ++---
testcases/features/doctor.py | 5 ++---
testcases/features/domino.py | 5 ++---
testcases/features/promise.py | 1 -
testcases/features/sfc/sfc.py | 3 +--
5 files changed, 7 insertions(+), 12 deletions(-)
(limited to 'testcases/features')
diff --git a/testcases/features/copper.py b/testcases/features/copper.py
index c79754a1b..e03e60f1c 100755
--- a/testcases/features/copper.py
+++ b/testcases/features/copper.py
@@ -42,7 +42,7 @@ def main():
start_time = time.time()
- ret_val = functest_utils.execute_command(cmd, logger, exit_on_error=False)
+ ret_val = functest_utils.execute_command(cmd, exit_on_error=False)
stop_time = time.time()
duration = round(stop_time - start_time, 1)
@@ -58,14 +58,13 @@ def main():
'duration': duration,
'status': test_status,
}
- functest_utils.logger_test_results(logger, "Copper",
+ functest_utils.logger_test_results("Copper",
"copper-notification",
details['status'], details)
try:
if args.report:
functest_utils.push_results_to_db("copper",
"copper-notification",
- logger,
start_time,
stop_time,
details['status'],
diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index 02edd25ca..713931346 100755
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -41,7 +41,7 @@ def main():
cmd = 'cd %s/tests && ./run.sh' % DOCTOR_REPO
start_time = time.time()
- ret = functest_utils.execute_command(cmd, logger, info=True,
+ ret = functest_utils.execute_command(cmd, info=True,
exit_on_error=False)
stop_time = time.time()
@@ -62,13 +62,12 @@ def main():
status = "FAIL"
if details['status'] == "OK":
status = "PASS"
- functest_utils.logger_test_results(logger, "Doctor",
+ functest_utils.logger_test_results("Doctor",
"doctor-notification",
status, details)
if args.report:
functest_utils.push_results_to_db("doctor",
"doctor-notification",
- logger,
start_time,
stop_time,
status,
diff --git a/testcases/features/domino.py b/testcases/features/domino.py
index 291a3b49b..f99a53b6c 100755
--- a/testcases/features/domino.py
+++ b/testcases/features/domino.py
@@ -42,7 +42,7 @@ def main():
cmd = 'cd %s && ./tests/run_multinode.sh' % DOMINO_REPO
start_time = time.time()
- ret = functest_utils.execute_command(cmd, logger, exit_on_error=False)
+ ret = functest_utils.execute_command(cmd, exit_on_error=False)
stop_time = time.time()
duration = round(stop_time - start_time, 1)
@@ -68,14 +68,13 @@ def main():
elif details['status'] == "SKIPPED":
status = "SKIP"
- functest_utils.logger_test_results(logger, "Domino",
+ functest_utils.logger_test_results("Domino",
"domino-multinode",
status, details)
if args.report:
if status is not "SKIP":
functest_utils.push_results_to_db("domino",
"domino-multinode",
- logger,
start_time,
stop_time,
status,
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index 3728adfe5..27186550e 100755
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -245,7 +245,6 @@ def main():
functest_utils.push_results_to_db("promise",
"promise",
- logger,
start_time,
stop_time,
status,
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index 3cf1052b6..5f771137d 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -414,7 +414,7 @@ def main():
" :) \n" + '\033[0m')
# TODO report results to DB
- # functest_utils.logger_test_results(logger, "SFC",
+ # functest_utils.logger_test_results("SFC",
# "odl-sfc",
# status, details)
# see doctor, promise, domino, ...
@@ -422,7 +422,6 @@ def main():
# logger.info("Pushing odl-SFC results")
# functest_utils.push_results_to_db("functest",
# "odl-sfc",
- # logger,
# start_time,
# stop_time,
# status,
--
cgit