[sr-dev] git:master: Fixed test 40.sh

[Marius Zbihlei]

Module: sip-router
Branch: master
Commit: db29fbe3b6d3ff5f656ef8ebe3a65272b4c89ae3
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db29fbe3b6d3ff5f656ef8ebe3a65272b4c89ae3

Author: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Committer: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Date:   Fri Oct 23 17:57:32 2009 +0300

Fixed test 40.sh

---

 test/unit/40.cfg |    7 ++++---
 test/unit/40.sh  |   18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/unit/40.cfg b/test/unit/40.cfg
index dc6379a..f9f5c6c 100644
--- a/test/unit/40.cfg
+++ b/test/unit/40.cfg
@@ -1,8 +1,9 @@
-mpath="../modules"
 
+mpath="../../modules_k"
+
+loadmodule "../../modules/tm/tm.so"
 loadmodule "sl/sl.so"
-loadmodule "tm/tm.so"
-loadmodule "db_mysql/db_mysql.so"
+loadmodule "../../modules/db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "pike/pike.so"
diff --git a/test/unit/40.sh b/test/unit/40.sh
index 2ae9ab1..6e2b298 100755
--- a/test/unit/40.sh
+++ b/test/unit/40.sh
@@ -35,24 +35,24 @@ if ! (check_sipp && check_kamailio && check_module "db_mysql" && check_mysql); t
 fi ;
 
 # add an registrar entry to the db;
-$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo at localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);"
+$MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:foo at 127.0.0.1:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);"
 
 # start
-../$BIN -w . -f $CFG &> /dev/null
+$BIN -w . -f $CFG &> /dev/null
 ret=$?
 
 # this should work
 if [ "$ret" -eq 0 ]; then
-	sipp -sn uas -bg -i localhost -m 10 -p $UAS &> /dev/null
-	sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -p $UAC &> /dev/null
+	sipp -sn uas -bg -i 127.0.0.1 -m 10 -p $UAS &> /dev/null
+	sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 10 -p $UAC &> /dev/null
 	ret=$?
 fi;
 
 # this should be trigger the blocking
 if [ "$ret" -eq 0 ]; then
 	killall -9 sipp > /dev/null 2>&1
-	sipp -sn uas -bg -i localhost -m 11 -p $UAS &> /dev/null
-	sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 11 -p $UAC &> /dev/null
+	sipp -sn uas -bg -i 127.0.0.1 -m 11 -p $UAS &> /dev/null
+	sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 11 -p $UAC &> /dev/null
 	ret=$?
 fi;
 
@@ -60,8 +60,8 @@ fi;
 if [ "$ret" -eq 1 ]; then
 	sleep 7
 	killall -9 sipp > /dev/null 2>&1
-	sipp -sn uas -bg -i localhost -m 15 -p $UAS &> /dev/null
-	sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 15 -p $UAC &> /dev/null
+	sipp -sn uas -bg -i 127.0.0.1 -m 15 -p $UAS &> /dev/null
+	sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 15 -p $UAC &> /dev/null
 	ret=$?
 fi;
 
@@ -69,5 +69,5 @@ sleep 1
 $KILL
 killall -9 sipp > /dev/null 2>&1
 
-$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo at localhost:$UAS\") and (user_agent = \"ser_test\"));"
+$MYSQL "DELETE FROM location WHERE ((contact = \"sip:foo at 127.0.0.1:$UAS\") and (user_agent = \"ser_test\"));"
 exit $ret
\ No newline at end of file