mirror of
https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
synced 2025-11-21 04:25:08 +00:00
regression_test: Add exit on error flag
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
@@ -21,7 +21,7 @@ Help()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
while getopts ":h:s:S:p:w:m:r:F:B:U:D:H:M:C:e:V:" option; do
|
while getopts ":h:s:S:p:w:m:r:F:B:U:D:H:M:C:e:V:E:" option; do
|
||||||
case "${option}" in
|
case "${option}" in
|
||||||
h) # display Help
|
h) # display Help
|
||||||
Help
|
Help
|
||||||
@@ -73,6 +73,9 @@ while getopts ":h:s:S:p:w:m:r:F:B:U:D:H:M:C:e:V:" option; do
|
|||||||
V)
|
V)
|
||||||
VAP_SSID=${OPTARG}
|
VAP_SSID=${OPTARG}
|
||||||
;;
|
;;
|
||||||
|
E)
|
||||||
|
EXIT_ON_ERROR=${OPTARG}
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
||||||
;;
|
;;
|
||||||
@@ -444,12 +447,14 @@ function test() {
|
|||||||
if [[ $TEXT =~ "tests failed" ]]; then
|
if [[ $TEXT =~ "tests failed" ]]; then
|
||||||
TEXTCLASS="partial_failure"
|
TEXTCLASS="partial_failure"
|
||||||
TDTEXT="Partial Failure"
|
TDTEXT="Partial Failure"
|
||||||
|
CONTINUE="False"
|
||||||
echo "Partial Failure"
|
echo "Partial Failure"
|
||||||
LOGGING="<a href=\"${URL2}/logs/${NAME}\" target=\"_blank\">Logging directory</a>"
|
LOGGING="<a href=\"${URL2}/logs/${NAME}\" target=\"_blank\">Logging directory</a>"
|
||||||
|
|
||||||
elif [[ $TEXT =~ "FAILED" ]]; then
|
elif [[ $TEXT =~ "FAILED" ]]; then
|
||||||
TEXTCLASS="partial_failure"
|
TEXTCLASS="partial_failure"
|
||||||
TDTEXT="ERROR"
|
TDTEXT="ERROR"
|
||||||
|
CONTINUE="False"
|
||||||
echo "ERROR"
|
echo "ERROR"
|
||||||
LOGGING="<a href=\"${URL2}/logs/${NAME}\" target=\"_blank\">Logging directory</a>"
|
LOGGING="<a href=\"${URL2}/logs/${NAME}\" target=\"_blank\">Logging directory</a>"
|
||||||
else
|
else
|
||||||
@@ -461,6 +466,7 @@ function test() {
|
|||||||
if (( FILESIZE > 0)); then
|
if (( FILESIZE > 0)); then
|
||||||
TEXTCLASS="failure"
|
TEXTCLASS="failure"
|
||||||
TDTEXT="Failure"
|
TDTEXT="Failure"
|
||||||
|
CONTINUE="False"
|
||||||
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/${NAME}\" target=\"_blank\">Logging directory</a>"
|
LOGGING="<a href=\"${URL2}/logs/${NAME}\" target=\"_blank\">Logging directory</a>"
|
||||||
fi
|
fi
|
||||||
@@ -509,7 +515,11 @@ function start_tests() {
|
|||||||
CHECK_PORTS+=("$UPSTREAM")
|
CHECK_PORTS+=("$UPSTREAM")
|
||||||
fi
|
fi
|
||||||
PORTS=$( IFS=$','; echo "${CHECK_PORTS[*]}" )
|
PORTS=$( IFS=$','; echo "${CHECK_PORTS[*]}" )
|
||||||
|
if [[ ${#EXIT_ON_ERROR} -gt 0 ]]; then
|
||||||
|
if [[ $(CONTINUE) == "True" ]]; then
|
||||||
test
|
test
|
||||||
|
fi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -628,6 +638,7 @@ td.testname {
|
|||||||
#mail -s "Regression Results" scripters@candelatech.com <<<$content
|
#mail -s "Regression Results" scripters@candelatech.com <<<$content
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CONTINUE="True"
|
||||||
results=()
|
results=()
|
||||||
NOW=$(date +"%Y-%m-%d-%H-%M")
|
NOW=$(date +"%Y-%m-%d-%H-%M")
|
||||||
NOW="${NOW/:/-}"
|
NOW="${NOW/:/-}"
|
||||||
|
|||||||
Reference in New Issue
Block a user