X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Ftestcase_common.sh;h=b63d4d129e7d55b1f09d1c485ab6d7ba0f5a765d;hb=84ffd4a403baee1b7aa86f9986f0c1659a5a0881;hp=702fbf8c041de294faa7fc05968ec92ed2d543d2;hpb=443d4728b1930a96ca174e6940c95558f7806684;p=nonrtric.git

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 702fbf8c..b63d4d12 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -229,7 +229,7 @@ __log_test_start() {
 # Function to print current statistics
 __print_current_stats() {
 	if [ $PRINT_CURRENT_STATS -ne 0 ]; then
-		echo " Currrent stats - tests, passes, fails, conf fails, deviations: $RES_TEST, $RES_PASS, $RES_FAIL, $RES_CONF_FAIL, $RES_DEVIATION"
+		echo " Current stats - exe-time, tests, passes, fails, conf fails, deviations: $(($SECONDS-$TCTEST_START)), $RES_TEST, $RES_PASS, $RES_FAIL, $RES_CONF_FAIL, $RES_DEVIATION"
 	fi
 }
 
@@ -310,6 +310,14 @@ __log_conf_fail_body() {
 	__check_stop_at_error
 }
 
+# Function to log a configuration that is not supported
+__log_conf_fail_not_supported() {
+	echo -e $RED" FAIL, function not supported"$ERED$@
+	((RES_CONF_FAIL++))
+	__print_current_stats
+	__check_stop_at_error
+}
+
 # Function to log a passed configuration setup
 __log_conf_ok() {
 	if [ $# -gt 0 ]; then
@@ -1228,8 +1236,11 @@ setup_testenvironment() {
 		echo -e $RED"One or more images could not be pulled or containers using the images could not be stopped/removed"$ERED
 		echo -e $RED"Or local image, overriding remote image, does not exist"$ERED
 		if [ $IMAGE_CATEGORY == "DEV" ]; then
-			echo -e $RED"Note that SNAPSHOT images may be purged from nexus after a certain period."$ERED
-			echo -e $RED"In that case, switch to use a released image instead."$ERED
+		    echo ""
+			echo -e $RED"Note that SNAPSHOT and staging images may be purged from nexus after a certain period."$ERED
+			echo -e $RED"In addition, the image may not have been updated in the current release so no SNAPSHOT or staging image exists"$ERED
+			echo -e $RED"In these cases, switch to use a released image instead, use the flag '--use-release-image <App-short-name>'"$ERED
+			echo -e $RED"Use the 'App-short-name' for the applicable image from the above table: 'Images configured for start arg'."$ERED
 		fi
 		echo "#################################################################################################"
 		echo ""
@@ -2497,13 +2508,15 @@ __do_curl() {
 
 __var_test() {
 	checkjsonarraycount=0
-
+	TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S")
 	if [ $# -eq 6 ]; then
 		if [[ $3 == "json:"* ]]; then
 			checkjsonarraycount=1
 		fi
 
 		echo -e $BOLD"TEST $TEST_SEQUENCE_NR (${BASH_LINENO[1]}): ${1}, ${3} ${4} ${5} within ${6} seconds"$EBOLD
+        echo "TEST $TEST_SEQUENCE_NR - ${TIMESTAMP}: (${BASH_LINENO[1]}): ${1}, ${3} ${4} ${5} within ${6} seconds" >> $HTTPLOG
+
 		((RES_TEST++))
 		((TEST_SEQUENCE_NR++))
 		start=$SECONDS
@@ -2572,6 +2585,7 @@ __var_test() {
 		fi
 
 		echo -e $BOLD"TEST $TEST_SEQUENCE_NR (${BASH_LINENO[1]}): ${1}, ${3} ${4} ${5}"$EBOLD
+		echo "TEST $TEST_SEQUENCE_NR - ${TIMESTAMP}: (${BASH_LINENO[1]}): ${1}, ${3} ${4} ${5}" >> $HTTPLOG
 		((RES_TEST++))
 		((TEST_SEQUENCE_NR++))
 		if [ $checkjsonarraycount -eq 0 ]; then