- add some linefeeds to test 12

- improve test to check the output


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3217 689a6050-402a-0410-94f2-e92a70836424

test/unit/12.cfg

@@ -1,3 +1,4 @@
+log_stderror=yes
 mpath="../modules/"
 loadmodule "mysql/mysql.so"
 loadmodule "sl/sl.so"
@@ -16,10 +17,10 @@ avp_aliases="identity_domain=i:82"
 avp_aliases="identity_uri=i:83"
 
 route{
-	xlog("received by openser[$pp] at '$Tf' from $si:$sp, method: $rm, transport: $rP:$Ri:$rp, user agent: $ua");
+	xlog("received by openser[$pp] at '$Tf' from $si:$sp, method: $rm, transport: $rP:$Ri:$rp, user agent: $ua\n");
 
 	if !(route(39)) {
-		xlog("L_ERR", "Error getting identity");
+		xlog("L_ERR", "Error getting identity\n");
 		exit;
 	}
 	xlog("L_ERR", "My identity: $avp(identity_uri)\n");
@@ -37,11 +38,11 @@ route{
 		append_hf("P-hint: outbound\r\n");
 		route(1);
 	};
-	xlog("From header tag: $(hdr(From){param.value,tag})");
+	xlog("From header tag: $(hdr(From){param.value,tag})\n");
 	
 	if(is_method("REGISTER")) {
 		if(is_present_hf("Expires")) {
-			xlog("Expires header field present");
+			xlog("Expires header field present\n");
 			if($(hdr(Expires){s.int}) > 0) {
 				xlog("this is an registration\n");
 			}
@@ -50,7 +51,7 @@ route{
 			}
 		}
 		if(is_present_hf("Contact")) {
-			xlog("Contact header field present");
+			xlog("Contact header field present\n");
 			if ($(hdr(Contact){param.value,expires}{s.int}) > 0) {
 				xlog("this is an registration\n");
 			}

test/unit/12.sh

@@ -4,6 +4,7 @@
 # needs the netcat utility to run
 
 CFG=12.cfg
+TMPFILE=`mktemp -t openser-test.XXXXXXXXXX`
 
 which nc > /dev/null
 ret=$?
@@ -13,7 +14,7 @@ if [ ! $? -eq 0 ] ; then
 	exit 0
 fi ;
 
-../openser -f $CFG > /dev/null
+../openser -f $CFG &> $TMPFILE
 ret=$?
 
 sleep 1
@@ -41,8 +42,35 @@ if [ "$ret" -eq 0 ] ; then
 	fi ;
 fi ;
 
+if [ "$ret" -eq 0 ] ; then
+	grep "from 127.0.0.1:33535, method: REGISTER, transport: UDP:127.0.0.1:5060, user agent: Twinkle/1.0"  $TMPFILE > /dev/null
+	ret=$?
+	if [ "$ret" -eq 0 ] ; then
+		grep "Getting identity from FROM URI" $TMPFILE > /dev/null
+		ret=$?
+		if [ "$ret" -eq 0 ] ; then
+			grep "My identity: sip:[email protected]" $TMPFILE > /dev/null
+			ret=$?
+			if [ "$ret" -eq 0 ] ; then
+				grep "Contact header field present" $TMPFILE > /dev/null
+				ret=$?
+				if [ "$ret" -eq 0 ] ; then
+					grep "this is an registration" $TMPFILE > /dev/null
+					ret=$?
+					if [ "$ret" -eq 0 ] ; then
+						grep "this is an unregistration" $TMPFILE > /dev/null
+						ret=$?
+					fi ;
+				fi ;
+			fi ;
+		fi ;
+	fi ;
+fi ;
+echo $ret
+
 cd ../test
 
 killall -9 openser
+rm $TMPFILE
 
 exit $ret