diff --git a/py-scripts/html_test_output.sh b/py-scripts/html_test_output.sh index 0e81c7cf..77eeb6b2 100755 --- a/py-scripts/html_test_output.sh +++ b/py-scripts/html_test_output.sh @@ -80,7 +80,6 @@ function run_test() { if (( $CURR_TEST_NUM > $STOP_NUM )) || (( $STOP_NUM == $CURR_TEST_NUM )) && (( $STOP_NUM != 0 )); then exit 1 fi -<<<<<<< HEAD echo "" echo "Test $CURR_TEST_NUM: $CURR_TEST_NAME" @@ -94,20 +93,8 @@ function run_test() { if (( $retval == 0 )); then results+=("${CURR_TEST_NAME}${i}SuccessSTDOUTSTDERR") else -<<<<<<< HEAD results+=("${CURR_TEST_NAME}${i}Failure") -======= - if (( $CURR_TEST_NUM > $START_NUM )) || (( $CURR_TEST_NUM == $START_NUM )); then - echo_print - echo "$i" - if $i; then - results+=("${CURR_TEST_NAME}Success") - else - results+=("${CURR_TEST_NAME}Failure") ->>>>>>> dipti-branch -======= - results+=("${CURR_TEST_NAME}${i}FailureSTDOUTSTDERR") ->>>>>>> 8a513833eb4e4b4859182d1875cf5b61f05d80cb + fi fi done @@ -124,7 +111,6 @@ function check_args() { function html_generator() { NOW=$(date +"%Y-%m-%d-%T") header=" -<<<<<<< HEAD Test All Scripts Results $NOW - - -

Candela Technologies

- - " - tail="
- - " - fname="/home/lanforge/html-reports/test_all_output_file-${NOW}.html" - echo $fname - echo $header"${results[@]}"$tail >> $fname -} -#true >~/test_all_output_file.txt -check_args $1 $2 -run_test ->>>>>>> dipti-branch html_generator #test generic and fileio are for macvlans