瀏覽代碼

test/unit: spell fixes

- mainly setup(n) <-> set(v) up distinction
Paul Donald 3 月之前
父節點
當前提交
3f1f75bf48
共有 20 個文件被更改,包括 34 次插入34 次删除
  1. 1 1
      test/unit/1.sh
  2. 1 1
      test/unit/10.sh
  3. 1 1
      test/unit/13.sh
  4. 1 1
      test/unit/17.sh
  5. 2 2
      test/unit/18.sh
  6. 3 3
      test/unit/23.sh
  7. 1 1
      test/unit/24.sh
  8. 2 2
      test/unit/25.sh
  9. 2 2
      test/unit/26.sh
  10. 2 2
      test/unit/3.sh
  11. 1 1
      test/unit/30.sh
  12. 1 1
      test/unit/31.sh
  13. 1 1
      test/unit/32.sh
  14. 3 3
      test/unit/37.sh
  15. 2 2
      test/unit/39.sh
  16. 1 1
      test/unit/4.sh
  17. 3 3
      test/unit/42.sh
  18. 2 2
      test/unit/43.sh
  19. 2 2
      test/unit/8.sh
  20. 2 2
      test/unit/9.sh

+ 1 - 1
test/unit/1.sh

@@ -23,7 +23,7 @@
 
 
 CFG=1.cfg
 CFG=1.cfg
 
 
-# setup config
+# set up config
 printf "debug=2\nrequest_route {\n ; \n}" > $CFG
 printf "debug=2\nrequest_route {\n ; \n}" > $CFG
 
 
 $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 $BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null

+ 1 - 1
test/unit/10.sh

@@ -23,7 +23,7 @@
 
 
 cd $CTL_DIR
 cd $CTL_DIR
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 cp $CTL $CTL.bak
 cp $CTL $CTL.bak
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" $CTLRC
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" $CTLRC

+ 1 - 1
test/unit/13.sh

@@ -31,7 +31,7 @@ fi ;
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup database
+# set up database
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"

+ 1 - 1
test/unit/17.sh

@@ -35,7 +35,7 @@ cat 2.cfg >> $CFG
 printf "modparam(\"$DB_ALL_MOD\", \"db_url\", \"berkeley://`pwd`/$CTL_DIR/$tmp_name\")" >> $CFG
 printf "modparam(\"$DB_ALL_MOD\", \"db_url\", \"berkeley://`pwd`/$CTL_DIR/$tmp_name\")" >> $CFG
 printf "\nrequest_route {\n ;\n}" >> $CFG
 printf "\nrequest_route {\n ;\n}" >> $CFG
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 
 
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" $CTLRC
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" $CTLRC

+ 2 - 2
test/unit/18.sh

@@ -30,7 +30,7 @@ fi ;
 # the config file
 # the config file
 CFG=18.cfg
 CFG=18.cfg
 
 
-# setup config
+# set up config
 printf "debug=3\nrequest_route {\n ;\n}" > $CFG
 printf "debug=3\nrequest_route {\n ;\n}" > $CFG
 
 
 # start:
 # start:
@@ -45,6 +45,6 @@ kill_kamailio
 
 
 rm $CFG
 rm $CFG
 rm -f ./pid.out
 rm -f ./pid.out
-rm -f ./pgid.out 
+rm -f ./pgid.out
 
 
 exit $ret
 exit $ret

+ 3 - 3
test/unit/23.sh

@@ -31,12 +31,12 @@ CFG=13.cfg
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup config
+# set up config
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 echo "modparam(\"carrierroute\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 
 
-# setup database
+# set up database
 $PSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');
 $PSQL "insert into carrier_name (id, carrier) values ('1', 'carrier1');
 insert into carrier_name (id, carrier) values ('2', 'default');
 insert into carrier_name (id, carrier) values ('2', 'default');
 insert into carrier_name (id, carrier) values ('3', 'premium');
 insert into carrier_name (id, carrier) values ('3', 'premium');
@@ -89,7 +89,7 @@ fi ;
 
 
 kill_kamailio
 kill_kamailio
 
 
-# cleanup database
+# clean up database
 $PSQL "delete from carrier_name where id = 1;
 $PSQL "delete from carrier_name where id = 1;
 delete from carrier_name where id = 2;
 delete from carrier_name where id = 2;
 delete from carrier_name where id = 3;
 delete from carrier_name where id = 3;

+ 1 - 1
test/unit/24.sh

@@ -30,7 +30,7 @@ tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 
 cd ../../utils/kamctl/
 cd ../../utils/kamctl/
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 sed -i "s/# DBENGINE=MYSQL/DBENGINE=PGSQL/g" $CTLRC
 sed -i "s/# DBENGINE=MYSQL/DBENGINE=PGSQL/g" $CTLRC
 sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
 sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC

+ 2 - 2
test/unit/25.sh

@@ -25,7 +25,7 @@
 
 
 cleanup() {
 cleanup() {
 	killall -9 sipp > /dev/null 2>&1
 	killall -9 sipp > /dev/null 2>&1
-	kill_kamailio	
+	kill_kamailio
 
 
 	$MYSQL "delete from location where (user_agent = \"kamailio_test\");"
 	$MYSQL "delete from location where (user_agent = \"kamailio_test\");"
 	$MYSQL "delete from userblacklist where username='49721123456786';"
 	$MYSQL "delete from userblacklist where username='49721123456786';"
@@ -61,7 +61,7 @@ $MYSQL "insert into location (ruid,username,contact,socket,user_agent,cseq,q) va
 
 
 $MYSQL "insert into location (ruid,username,contact,socket,user_agent,cseq,q) values (\"ul-ruid-gg\",\"user4946\",\"sip:[email protected]\",\"udp:127.0.0.1:5060\",\"kamailio_test\",1,-1);"
 $MYSQL "insert into location (ruid,username,contact,socket,user_agent,cseq,q) values (\"ul-ruid-gg\",\"user4946\",\"sip:[email protected]\",\"udp:127.0.0.1:5060\",\"kamailio_test\",1,-1);"
 
 
-# setup userblacklist, first some dummy data
+# set up userblacklist, first some dummy data
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675454','','49900','0');"
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675454','','49900','0');"
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675453','test.domain','49901','0');"
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675453','test.domain','49901','0');"
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675231','test','499034132','0');"
 $MYSQL "insert into userblacklist (username, domain, prefix, whitelist) values ('494675231','test','499034132','0');"

+ 2 - 2
test/unit/26.sh

@@ -31,11 +31,11 @@ CFG=26.cfg
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup config
+# set up config
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 
-# setup database
+# set up database
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"

+ 2 - 2
test/unit/3.sh

@@ -38,7 +38,7 @@ tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 
 cd $CTL_DIR
 cd $CTL_DIR
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 sed -i '' -e "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC
 sed -i '' -e "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC
 sed -i '' -e "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
 sed -i '' -e "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
@@ -60,7 +60,7 @@ if [ "$ret" -eq 0 ] ; then
 	ret=$?
 	ret=$?
 fi ;
 fi ;
 
 
-# cleanup
+# clean up
 mv $CTLRC.bak $CTLRC
 mv $CTLRC.bak $CTLRC
 mv $DBCTL.mysql.bak $DBCTL.mysql
 mv $DBCTL.mysql.bak $DBCTL.mysql
 mv $DBCTL.bak $DBCTL
 mv $DBCTL.bak $DBCTL

+ 1 - 1
test/unit/30.sh

@@ -31,7 +31,7 @@ CFG=30.cfg
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup config
+# set up config
 echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute-2.cfg\")" >> $CFG
 echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute-2.cfg\")" >> $CFG
 
 
 
 

+ 1 - 1
test/unit/31.sh

@@ -30,7 +30,7 @@ fi ;
 CFG=11.cfg
 CFG=11.cfg
 
 
 DOMAIN="local"
 DOMAIN="local"
-# setup 500 contacts
+# set up 500 contacts
 NR=500
 NR=500
 
 
 COUNTER=0
 COUNTER=0

+ 1 - 1
test/unit/32.sh

@@ -30,7 +30,7 @@ fi ;
 CFG=11.cfg
 CFG=11.cfg
 
 
 DOMAIN="local"
 DOMAIN="local"
-# setup 250 contacts
+# set up 250 contacts
 NR=25
 NR=25
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak

+ 3 - 3
test/unit/37.sh

@@ -35,11 +35,11 @@ fi ;
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup config
+# set up config
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 
-# setup database
+# set up database
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier2');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier2');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier3');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier3');"
@@ -78,7 +78,7 @@ fi ;
 
 
 kill_kamailio
 kill_kamailio
 
 
-# cleanup database
+# clean up database
 $MYSQL "delete from carrier_name where id = 1;"
 $MYSQL "delete from carrier_name where id = 1;"
 $MYSQL "delete from carrier_name where id = 2;"
 $MYSQL "delete from carrier_name where id = 2;"
 $MYSQL "delete from carrier_name where id = 3;"
 $MYSQL "delete from carrier_name where id = 3;"

+ 2 - 2
test/unit/39.sh

@@ -31,7 +31,7 @@ fi ;
 CFG=11.cfg
 CFG=11.cfg
 
 
 DOMAIN="local"
 DOMAIN="local"
-# setup 250 contacts
+# set up 250 contacts
 NR=25
 NR=25
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
@@ -40,7 +40,7 @@ printf "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG
 printf "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 printf "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 printf "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 printf "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 
 
-# isql unfortunally only allow one statement per line
+# isql unfortunately only allow one statement per line
 COUNTER=0
 COUNTER=0
 CNT=0
 CNT=0
 while [  $COUNTER -lt $NR ]; do
 while [  $COUNTER -lt $NR ]; do

+ 1 - 1
test/unit/4.sh

@@ -28,7 +28,7 @@ if ! (check_kamailio); then
 	exit 0
 	exit 0
 fi ;
 fi ;
 
 
-# setup config
+# set up config
 printf "loadmodule \"jsonrpcs.so\"\n" > $CFG
 printf "loadmodule \"jsonrpcs.so\"\n" > $CFG
 printf "modparam(\"jsonrpcs\", \"transport\", 2)\n" >> $CFG
 printf "modparam(\"jsonrpcs\", \"transport\", 2)\n" >> $CFG
 printf "modparam(\"jsonrpcs\", \"fifo_name\", \"$RPCFIFOPATH\")\n" >> $CFG
 printf "modparam(\"jsonrpcs\", \"fifo_name\", \"$RPCFIFOPATH\")\n" >> $CFG

+ 3 - 3
test/unit/42.sh

@@ -31,12 +31,12 @@ CFG=26.cfg
 
 
 cp $CFG $CFG.bak
 cp $CFG $CFG.bak
 
 
-# setup config
+# set up config
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"match_mode\", 128)" >> $CFG
 echo "modparam(\"carrierroute\", \"match_mode\", 128)" >> $CFG
 
 
-# setup database
+# set up database
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('1', 'default');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('2', 'carrier1');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
 $MYSQL "insert into carrier_name (id, carrier) values ('3', 'carrier2');"
@@ -125,7 +125,7 @@ fi;
 kill_kamailio
 kill_kamailio
 killall -9 sipp
 killall -9 sipp
 
 
-# cleanup database
+# clean up database
 $MYSQL "delete from carrier_name where id = 1;"
 $MYSQL "delete from carrier_name where id = 1;"
 $MYSQL "delete from carrier_name where id = 2;"
 $MYSQL "delete from carrier_name where id = 2;"
 $MYSQL "delete from carrier_name where id = 3;"
 $MYSQL "delete from carrier_name where id = 3;"

+ 2 - 2
test/unit/43.sh

@@ -29,7 +29,7 @@ fi ;
 
 
 CFG=43.cfg
 CFG=43.cfg
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXX`
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXX`
-# setup config
+# set up config
 echo "loadmodule \"tm/tm.so\"" > $CFG
 echo "loadmodule \"tm/tm.so\"" > $CFG
 echo "loadmodule \"sl/sl.so\"" >> $CFG
 echo "loadmodule \"sl/sl.so\"" >> $CFG
 echo "loadmodule \"mi_fifo/mi_fifo.so\"" >> $CFG
 echo "loadmodule \"mi_fifo/mi_fifo.so\"" >> $CFG
@@ -49,7 +49,7 @@ $CTL fifo forward_list &> /dev/null
 $CTL fifo forward_filter 0=REGISTER:INVITE &> /dev/null
 $CTL fifo forward_filter 0=REGISTER:INVITE &> /dev/null
 $CTL fifo forward_list &> /dev/null
 $CTL fifo forward_list &> /dev/null
 $CTL fifo forward_proxy 0=127.0.0.1:7000 &> /dev/null
 $CTL fifo forward_proxy 0=127.0.0.1:7000 &> /dev/null
-$CTL fifo forward_list > $TMPFILE 
+$CTL fifo forward_list > $TMPFILE
 
 
 
 
 
 

+ 2 - 2
test/unit/8.sh

@@ -25,7 +25,7 @@ tmp_name=""$RANDOM"_kamailiodb_tmp"
 
 
 cd $CTL_DIR
 cd $CTL_DIR
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" $CTLRC
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=DBTEXT/g" $CTLRC
 sed -i'' -e "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
 sed -i'' -e "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" $CTLRC
@@ -43,7 +43,7 @@ if [ "$ret" -eq 0 ] ; then
 	ret=$?
 	ret=$?
 fi ;
 fi ;
 
 
-# cleanup
+# clean up
 mv $CTLRC.bak $CTLRC
 mv $CTLRC.bak $CTLRC
 mv $DBCTL.bak $DBCTL
 mv $DBCTL.bak $DBCTL
 
 

+ 2 - 2
test/unit/9.sh

@@ -23,7 +23,7 @@
 
 
 cd $CTL_DIR
 cd $CTL_DIR
 
 
-# setup config file
+# set up config file
 cp $CTLRC $CTLRC.bak
 cp $CTLRC $CTLRC.bak
 cp $CTL $CTL.bak
 cp $CTL $CTL.bak
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC
 sed -i'' -e "s/# DBENGINE=MYSQL/DBENGINE=MYSQL/g" $CTLRC
@@ -43,7 +43,7 @@ if [ "$ret" -eq 0 ] ; then
 	ret=$?
 	ret=$?
 fi ;
 fi ;
 
 
-# cleanup
+# clean up
 mv $CTLRC.bak $CTLRC
 mv $CTLRC.bak $CTLRC
 mv $CTL.bak $CTL
 mv $CTL.bak $CTL