Module: sip-router Branch: master Commit: 30c56197c7c707fce63071c55f1c77a2cfe464cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30c5619… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 19 11:18:39 2009 +0300 Fixed test 25. --- test/unit/25.cfg | 6 +++--- test/unit/25.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/unit/25.cfg b/test/unit/25.cfg index 1cf312c..6c68a43 100644 --- a/test/unit/25.cfg +++ b/test/unit/25.cfg @@ -2,13 +2,13 @@ debug=0 listen=127.0.0.1 port=5059 -mpath="../modules/" +mpath="../../modules_k/" +loadmodule "../../modules/tm/tm.so" loadmodule "sl/sl.so" -loadmodule "tm/tm.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "xlog/xlog.so" -loadmodule "db_mysql/db_mysql.so" +loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "pv/pv.so" loadmodule "userblacklist/userblacklist.so" loadmodule "maxfwd/maxfwd.so" diff --git a/test/unit/25.sh b/test/unit/25.sh index 1422697..2289c00 100755 --- a/test/unit/25.sh +++ b/test/unit/25.sh @@ -46,17 +46,17 @@ fi ; CFG=25.cfg # add an registrar entry to the db; -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456789\",\"sip:123456789@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456789\",\"sip:123456789@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456788\",\"sip:123456788@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456788\",\"sip:123456788@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456787\",\"sip:123456787@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456787\",\"sip:123456787@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456786\",\"sip:123456786@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456786\",\"sip:123456786@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456785\",\"sip:223456789@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456785\",\"sip:223456789@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" -$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456784\",\"sip:2.23456789@localhost\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" +$MYSQL "insert into location (username,contact,socket,user_agent,cseq,q) values (\"49721123456784\",\"sip:2.23456789@127.0.0.1\",\"udp:127.0.0.1:5060\",\"ser_test\",1,-1);" # setup userblacklist, first some dummy data @@ -75,10 +75,10 @@ $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('1' $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('','0','_test_');" -../$BIN -w . -f $CFG &> /dev/null +$BIN -w . -f $CFG &> /dev/null sleep 1 -sipp -sn uas -bg -i localhost -p 5060 &> /dev/null +sipp -sn uas -bg -i 127.0.0.1 -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=$? @@ -108,7 +108,7 @@ if [ "$ret" -ne 1 ] ; then fi; $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('123456786','1','_test_');" -../scripts/$CTL fifo reload_blacklist +$CTL fifo reload_blacklist sipp -sn uac -s 49721123456786 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 2 -p 5061 &> /dev/null ret=$? @@ -131,7 +131,7 @@ ret=$? $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('2','1','_test_');" -../scripts/$CTL fifo reload_blacklist +$CTL fifo reload_blacklist if [ "$ret" -ne 1 ] ; then cleanup 1