From cc0c2870a18fb74a56410eca2d1870bddc945397 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 11 Apr 2019 08:36:06 +0000 Subject: [PATCH 1/1] Add output.xml with only INFO logging leve - Useful for post-processing. Change-Id: I6f71087f8c6f6d66fd86207d5df9abd10e94f855 Signed-off-by: Peter Mikus --- resources/libraries/bash/function/common.sh | 8 ++++++++ resources/libraries/python/PapiHistory.py | 2 +- resources/libraries/python/VppCounters.py | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 879602674a..eaad2ab3d5 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -580,6 +580,14 @@ function run_pybot () { pybot "${all_options[@]}" "${GENERATED_DIR}/tests/" PYBOT_EXIT_STATUS="$?" set -e + + # Generate INFO level output_info.xml for post-processing. + all_options=("--loglevel" "INFO") + all_options+=("--log" "none") + all_options+=("--report" "none") + all_options+=("--output" "${ARCHIVE_DIR}/output_info.xml") + all_options+=("${ARCHIVE_DIR}/output.xml") + rebot "${all_options[@]}" popd || die "Change directory operation failed." } diff --git a/resources/libraries/python/PapiHistory.py b/resources/libraries/python/PapiHistory.py index 78279f559a..6a4f913d03 100644 --- a/resources/libraries/python/PapiHistory.py +++ b/resources/libraries/python/PapiHistory.py @@ -104,7 +104,7 @@ class PapiHistory(object): history_list = DICT__DUTS_PAPI_HISTORY[node['host']] if not history_list: history_list = ("No PAPI command executed", ) - logger.trace( + logger.info( "{0} PAPI command history:\n{1}\n".format( node['host'], "\n".join(history_list))) diff --git a/resources/libraries/python/VppCounters.py b/resources/libraries/python/VppCounters.py index ff4ce29b3f..b65b58c89b 100644 --- a/resources/libraries/python/VppCounters.py +++ b/resources/libraries/python/VppCounters.py @@ -75,6 +75,7 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_runtime.vat", node, json_out=False) + logger.info(vat.get_script_stdout()) vat.script_should_have_passed() @staticmethod @@ -97,6 +98,7 @@ class VppCounters(object): """ vat = VatExecutor() vat.execute_script("show_runtime_verbose.vat", node, json_out=False) + logger.info(vat.get_script_stdout()) vat.script_should_have_passed() @staticmethod -- 2.16.6