- make carrierroute tests a little more robust, allow for a certain imbalance

  in routing, as the CRC32 hash is not perfect
- make userblacklist test make robust, sipp > 1.X is a little bit more
  sensitive during startup/ or needs a little bit more time to stop..


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

test/unit/25.sh

@@ -64,33 +64,30 @@ $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('',
 ../openser -w . -f $CFG &> /dev/null
 sleep 1
 
-sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
+sipp -sn uas -bg -i localhost -p 5060 &> /dev/null
+
 sipp -sn uac -s 49721123456789 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 ret=$?
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456788 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456787 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456786 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
 
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('123456786','1','_test_');"
-openserctl fifo reload_blacklist
+../scripts/openserctl fifo reload_blacklist
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456786 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
@@ -98,22 +95,19 @@ fi;
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist, description) values ('49721123456786','','12345','0','_test_');"
 
 if [ "$ret" -eq 0 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456786 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;
 
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('2','1','_test_');"
-openserctl fifo reload_blacklist
+../scripts/openserctl fifo reload_blacklist
 
 if [ "$ret" -eq 1 ] ; then
-	sipp -sn uas -bg -i localhost -m 1 -f 2 -p 5060 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null
 	ret=$?
 fi;

test/unit/26.sh

@@ -76,10 +76,11 @@ ret=$?
 sleep 1
 
 if [ "$ret" -eq 0 ] ; then
-	sipp -sn uas -bg -i localhost -m 10 -p 7000 &> /dev/null
-	sipp -sn uas -bg -i localhost -m 10 -p 8000 &> /dev/null
+	sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null
+	sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null
 	sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null
 	ret=$?
+	killall sipp &> /dev/null
 fi;
 
 if [ "$ret" -eq 0 ] ; then
@@ -95,6 +96,7 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 if [ "$ret" -eq 0 ] ; then
+	killall sipp &> /dev/null
 	sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null
 	ret=$?
@@ -107,6 +109,7 @@ flags, mask, next_domain) values ('5', '3', 'fallback', '49', '127.0.0.1:10000',
 
 if [ ! "$ret" -eq 0 ] ; then
 	../scripts/openserctl fifo cr_reload_routes
+	killall sipp &> /dev/null
 	sipp -sf failure_route.xml -bg -i localhost -m 10 -p 10000 &> /dev/null
 	sipp -sn uac -s 49721123456785 127.0.0.1:5060 -i 127.0.0.1 -m 10 -p 5061 &> /dev/null
 	ret=$?

test/unit/30.sh

@@ -39,10 +39,12 @@ ret=$?
 sleep 1
 
 if [ "$ret" -eq 0 ] ; then
-	sipp -sn uas -bg -i localhost -m 10 -p 7000 &> /dev/null
-	sipp -sn uas -bg -i localhost -m 10 -p 8000 &> /dev/null
+	# the distribution is not perfect
+	sipp -sn uas -bg -i localhost -m 12 -p 7000 &> /dev/null
+	sipp -sn uas -bg -i localhost -m 12 -p 8000 &> /dev/null
 	sipp -sn uac -s 49721123456787 127.0.0.1:5060 -i 127.0.0.1 -m 20 -p 5061 &> /dev/null
 	ret=$?
+	killall sipp &> /dev/null
 fi;
 
 if [ "$ret" -eq 0 ] ; then