git:master: test:unit Fixed unixodbc tests (tested with mysql connector) - sr-dev

3 Feb 2010

Module: sip-router
Branch: master
Commit: d5a382d95db57093a8e35f2018d18c998979005a
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d5a382d9...
Author: Marius Zbihlei marius.zbihlei@1and1.ro
Committer: Marius Zbihlei marius.zbihlei@1and1.ro
Date:   Wed Feb  3 14:19:51 2010 +0200
test:unit Fixed unixodbc tests (tested with mysql connector)
---
test/unit/38.sh |    4 ++--
 test/unit/39.sh |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/38.sh b/test/unit/38.sh
index eff3b28..29dd758 100755
--- a/test/unit/38.sh
+++ b/test/unit/38.sh
@@ -36,7 +36,7 @@ echo "loadmodule "db_unixodbc/db_unixodbc.so"" >> $CFG
 echo "modparam("$DB_ALL_MOD", "db_url", "unixodbc://openserro:openserro@localhost/openser")" >> $CFG
# start
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 ret=$?
sleep 1
@@ -45,4 +45,4 @@ $KILL
 mv $CFG.bak $CFG
 rm -f dispatcher.list
-exit $ret
\ No newline at end of file
+exit $ret
diff --git a/test/unit/39.sh b/test/unit/39.sh
index d14cfff..9e8e2d6 100755
--- a/test/unit/39.sh
+++ b/test/unit/39.sh
@@ -45,7 +45,7 @@ COUNTER=0
 CNT=0
 while [  $COUNTER -lt $NR ]; do
    COUNTER=$(($COUNTER+1))
-	echo -e "insert into location (id, username, domain, contact, user_agent) values ('$CNT', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+1', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+2', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+3', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+4', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+5', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, c
 ontact, user_agent) values ('$CNT+6', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+7', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+8', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$CNT+9', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n " | $ISQL > /dev/null
+	echo -e "insert into location (id, username, domain, contact, user_agent) values ('$CNT', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+1))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+2))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+3))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+4))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+5))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location
  (id, username, domain, contact, user_agent) values ('$(($CNT+6))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+7))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+8))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); \n insert into location (id, username, domain, contact, user_agent) values ('$(($CNT+9))', 'foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___');" | $ISQL
    CNT=$(($CNT+10))
 done

    