aboutsummaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-09-06 13:25:38 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-06 13:25:39 +0000
commite8af84a1bd81becee94d6a9b9513570f253c7c45 (patch)
treec3a3024006ee77679d34abfcbccee1af38c1959e /testcases
parent8c579ce26cfbb59426d6d88c89d8ff12d8d1ef64 (diff)
parenta7d390f6a5d05cb632d933c03f170b5bc25be534 (diff)
Merge "Remove all logers as utils method args." into stable/colorado
Diffstat (limited to 'testcases')
-rwxr-xr-xtestcases/Controllers/ODL/OpenDaylightTesting.py2
-rw-r--r--testcases/Controllers/ONOS/Sfc/Sfc.py1
-rwxr-xr-xtestcases/Controllers/ONOS/Teston/onosfunctest.py1
-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
-rwxr-xr-xtestcases/features/copper.py3
-rwxr-xr-xtestcases/features/doctor.py3
-rwxr-xr-xtestcases/features/domino.py3
-rwxr-xr-xtestcases/features/promise.py1
-rwxr-xr-xtestcases/features/sfc/sfc.py3
-rwxr-xr-xtestcases/vnf/vIMS/vIMS.py6
-rwxr-xr-xtestcases/vnf/vRNC/parser.py5
14 files changed, 12 insertions, 28 deletions
diff --git a/testcases/Controllers/ODL/OpenDaylightTesting.py b/testcases/Controllers/ODL/OpenDaylightTesting.py
index 22df9f667..173de87f9 100755
--- a/testcases/Controllers/ODL/OpenDaylightTesting.py
+++ b/testcases/Controllers/ODL/OpenDaylightTesting.py
@@ -172,7 +172,7 @@ class ODLTestCases:
details['description'] = result.suite.name
details['tests'] = visitor.get_data()
if not ft_utils.push_results_to_db(
- "functest", "odl", cls.logger, start_time, stop_time,
+ "functest", "odl", start_time, stop_time,
result.suite.status, details):
cls.logger.error("Cannot push ODL results to DB")
return False
diff --git a/testcases/Controllers/ONOS/Sfc/Sfc.py b/testcases/Controllers/ONOS/Sfc/Sfc.py
index a52019875..99d07aaed 100644
--- a/testcases/Controllers/ONOS/Sfc/Sfc.py
+++ b/testcases/Controllers/ONOS/Sfc/Sfc.py
@@ -217,7 +217,6 @@ class Sfc:
logger.info("Result is " + status)
functest_utils.push_results_to_db("functest",
"onos_sfc",
- logger,
start_time,
stop_time,
status,
diff --git a/testcases/Controllers/ONOS/Teston/onosfunctest.py b/testcases/Controllers/ONOS/Teston/onosfunctest.py
index 6b922fba9..01537b990 100755
--- a/testcases/Controllers/ONOS/Teston/onosfunctest.py
+++ b/testcases/Controllers/ONOS/Teston/onosfunctest.py
@@ -245,7 +245,6 @@ def OnosTest():
functest_utils.push_results_to_db("functest",
"onos",
- logger,
start_time,
stop_time,
status,
diff --git a/testcases/OpenStack/rally/run_rally-cert.py b/testcases/OpenStack/rally/run_rally-cert.py
index b77cbdf54..85d21d9bd 100755
--- a/testcases/OpenStack/rally/run_rally-cert.py
+++ b/testcases/OpenStack/rally/run_rally-cert.py
@@ -355,7 +355,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,
@@ -488,7 +487,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 4aa814a51..688a92402 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 390c8a65f..e93972182 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -163,7 +163,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):
@@ -225,7 +225,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():
@@ -370,7 +370,6 @@ def run_tempest(OPTION):
try:
ft_utils.push_results_to_db("functest",
case_name,
- None,
start_time,
stop_time,
status,
@@ -396,7 +395,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 d3ca44139..7e7173aee 100644
--- a/testcases/OpenStack/vPing/vping_util.py
+++ b/testcases/OpenStack/vPing/vping_util.py
@@ -452,7 +452,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'],
diff --git a/testcases/features/copper.py b/testcases/features/copper.py
index 9be909427..50319d965 100755
--- a/testcases/features/copper.py
+++ b/testcases/features/copper.py
@@ -60,14 +60,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 68c80a9e4..badcfe605 100755
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -73,13 +73,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 c717c060e..7835c5ce8 100755
--- a/testcases/features/domino.py
+++ b/testcases/features/domino.py
@@ -70,14 +70,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 3f58dcee8..47e360ca3 100755
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -242,7 +242,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 27d80bc00..a228ed298 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -420,7 +420,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, ...
@@ -428,7 +428,6 @@ def main():
# logger.info("Pushing odl-SFC results")
# functest_utils.push_results_to_db("functest",
# "odl-sfc",
- # logger,
# start_time,
# stop_time,
# status,
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index ffcd09b84..b72e4cd81 100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/testcases/vnf/vIMS/vIMS.py
@@ -114,7 +114,6 @@ def step_failure(step_name, error_msg):
status = "PASS"
functest_utils.push_results_to_db("functest",
"vims",
- None,
TESTCASE_START_TIME,
stop_time,
status,
@@ -236,7 +235,6 @@ def test_clearwater():
functest_utils.push_results_to_db("functest",
"vims",
- logger,
TESTCASE_START_TIME,
end_time_ts,
status,
@@ -399,10 +397,10 @@ def main():
logger.info("Prepare virtualenv for cloudify-cli")
cmd = "chmod +x " + VIMS_DIR + "create_venv.sh"
- functest_utils.execute_command(cmd, logger)
+ functest_utils.execute_command(cmd)
time.sleep(3)
cmd = VIMS_DIR + "create_venv.sh " + VIMS_DATA_DIR
- functest_utils.execute_command(cmd, logger)
+ functest_utils.execute_command(cmd)
cfy.download_manager_blueprint(
CFY_MANAGER_BLUEPRINT['url'], CFY_MANAGER_BLUEPRINT['branch'])
diff --git a/testcases/vnf/vRNC/parser.py b/testcases/vnf/vRNC/parser.py
index 463261286..5ff207c14 100755
--- a/testcases/vnf/vRNC/parser.py
+++ b/testcases/vnf/vRNC/parser.py
@@ -43,7 +43,6 @@ def main():
start_time = time.time()
log_file = RESULTS_DIR + "/parser.log"
ret = functest_utils.execute_command(cmd,
- logger,
info=True,
exit_on_error=False,
output_file=log_file)
@@ -54,8 +53,7 @@ def main():
start_time,
stop_time)
- functest_utils.logger_test_results(logger,
- project,
+ functest_utils.logger_test_results(project,
case_name,
status,
details)
@@ -64,7 +62,6 @@ def main():
logger.debug("Report Parser Results to DB......")
functest_utils.push_results_to_db(project,
case_name,
- logger,
start_time,
stop_time,
status,