From e3d6f897b008407d47a91c9f1b5eb5961924bd38 Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Mon, 5 Sep 2016 14:06:25 +0200 Subject: [PATCH] [Doctor test case] Redirect output to a log file The output shown in the Jenkins console will now be redirected to a file which will be available and linked to the artifacts repository. Change-Id: I2e9b5c2ab681a787aa0fc249844cc13feb581764 Signed-off-by: jose.lausuch Signed-off-by: Carlos Goncalves (cherry picked from commit de6ca443b6ea60111f57bfe1cc6153463847c209) --- testcases/features/doctor.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 6e6f26f37..213b56466 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -13,12 +13,13 @@ # 0.2: measure test duration and publish results under json format # # +import argparse import time -import argparse import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as functest_utils + parser = argparse.ArgumentParser() parser.add_argument("-r", "--report", help="Create json result file", @@ -29,6 +30,8 @@ functest_yaml = functest_utils.get_functest_yaml() dirs = functest_yaml.get('general').get('directories') DOCTOR_REPO = dirs.get('dir_repo_doctor') +RESULTS_DIR = functest_utils.get_parameter_from_yaml( + 'general.directories.dir_results') logger = ft_logger.Logger("doctor").getLogger() @@ -36,19 +39,23 @@ logger = ft_logger.Logger("doctor").getLogger() def main(): exit_code = -1 cmd = 'cd %s/tests && ./run.sh' % DOCTOR_REPO + log_file = RESULTS_DIR + "/doctor.log" + start_time = time.time() - ret = functest_utils.execute_command(cmd, logger, info=True, - exit_on_error=False) + ret = functest_utils.execute_command(cmd, + info=True, + exit_on_error=False, + output_file=log_file) stop_time = time.time() duration = round(stop_time - start_time, 1) if ret == 0: - logger.info("doctor OK") + logger.info("Doctor test case OK") test_status = 'OK' exit_code = 0 else: - logger.info("doctor FAILED") + logger.info("Doctor test case FAILED") test_status = 'NOK' details = { -- 2.16.6