scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-06 13:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

regression_test: Simplify logic to store logging information by writing it only once

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2022-01-05 17:47:16 -08:00
committed by shivam
parent 17d8a7c12e
commit f12a85fc9b
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
py-scripts/regression_test.sh
View File

@@ -549,11 +549,6 @@ function test() {
echo "Partial Failure" echo "Partial Failure"
mkdir "${LOG_DIR}/${NAME}" mkdir "${LOG_DIR}/${NAME}"
LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>" LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>"
if [[ $MGR == "localhost" ]]; then
cp "${HOMEPATH}"/lanforge_log* "${LOG_DIR}/${NAME}"
else
sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}"
fi
elif [[ $TEXT =~ "FAILED" ]] elif [[ $TEXT =~ "FAILED" ]]
then then
@@ -561,12 +556,6 @@ function test() {
TDTEXT="ERROR" TDTEXT="ERROR"
echo "ERROR" echo "ERROR"
LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>" LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>"
mkdir "${LOG_DIR}/${NAME}"
if [[ $MGR == "localhost" ]]; then
cp "${HOMEPATH}"/lanforge_log* "${LOG_DIR}/${NAME}"
else
sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}"
fi
else else
TEXTCLASS="success" TEXTCLASS="success"
TDTEXT="Success" TDTEXT="Success"
@@ -579,20 +568,20 @@ function test() {
TDTEXT="Failure" TDTEXT="Failure"
STDERR="<a href=\"${URL2}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a>" STDERR="<a href=\"${URL2}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a>"
LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>" LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>"
fi
if [[ ${#LOGGING} -gt 0 ]]; then
mkdir "${LOG_DIR}/${NAME}" mkdir "${LOG_DIR}/${NAME}"
if [[ $MGR == "localhost" ]]; then if [[ $MGR == "localhost" ]]; then
cp "${HOMEPATH}"/lanforge_log* "${LOG_DIR}/${NAME}" cp "${HOMEPATH}"/lanforge_log* "${LOG_DIR}/${NAME}"
else else
sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}" sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}"
fi fi
if [[ ${#LOGGING} -gt 0 ]]; then
LINE=$(grep -n 'Starting Scenario' "${LOG_DIR}/${NAME}/lanforge_log_0.txt" | awk -F: '{print $1}' | tail -1) LINE=$(grep -n 'Starting Scenario' "${LOG_DIR}/${NAME}/lanforge_log_0.txt" | awk -F: '{print $1}' | tail -1)
LOG_TEXT=$(tail -N+"${LINE}" "${LOG_DIR}/${NAME}/lanforge_log_0.txt") LOG_TEXT=$(tail -N+"${LINE}" "${LOG_DIR}/${NAME}/lanforge_log_0.txt")
$LOG_TEXT >> "${LOG_DIR}/${NAME}/lanforge_log_0.txt" $LOG_TEXT >> "${LOG_DIR}/${NAME}/lanforge_log_0.txt"
fi fi
fi
results+=("<tr><td>${CURR_TEST_NAME}</td> results+=("<tr><td>${CURR_TEST_NAME}</td>
<td class='scriptdetails'>${testcommand}</td> <td class='scriptdetails'>${testcommand}</td>
<td class='${TEXTCLASS}'>$TDTEXT</td> <td class='${TEXTCLASS}'>$TDTEXT</td>