- remove unneeded mysql stuff from test 8

- test 17 creates now a fresh db


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

test/unit/17.sh

@@ -8,16 +8,38 @@ fi ;
 
 CFG=17.cfg
 
+tmp_name=""$RANDOM"_openserdb_tmp"
+
 echo "loadmodule \"../modules/db_berkeley/db_berkeley.so\"" >> $CFG
 cat 2.cfg >> $CFG
-echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"db_berkeley://`pwd`/../scripts/db_berkeley/openser\")" >> $CFG
+echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"db_berkeley://`pwd`/../scripts/$tmp_name\")" >> $CFG
+
+cd ../scripts
+
+# setup config file
+cp openserctlrc openserctlrc.bak
+sed -i "s/# SIP_DOMAIN=openser.org/SIP_DOMAIN=sip.localhost/g" openserctlrc
+sed -i "s/# DBENGINE=MYSQL/DBENGINE=DB_BERKELEY/g" openserctlrc
+sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
+sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
+sed -i "s/# INSTALL_SERWEB_TABLES=ask/INSTALL_SERWEB_TABLES=yes/g" openserctlrc
 
-../openser -f $CFG > /dev/null
+./openserdbctl create $tmp_name > /dev/null
 ret=$?
 
+if [ "$ret" -eq 0 ] ; then
+	../openser -f ../test/$CFG > /dev/null	
+	ret=$?
+fi ;
+
 sleep 1
 killall -9 openser
 
+# cleanup
+./openserdbctl drop $tmp_name > /dev/null
+mv openserctlrc.bak openserctlrc
+
+cd ../test/
 rm $CFG
 
 exit $ret

test/unit/8.sh

@@ -13,10 +13,6 @@ sed -i "s/# INSTALL_EXTRA_TABLES=ask/INSTALL_EXTRA_TABLES=yes/g" openserctlrc
 sed -i "s/# INSTALL_PRESENCE_TABLES=ask/INSTALL_PRESENCE_TABLES=yes/g" openserctlrc
 sed -i "s/# INSTALL_SERWEB_TABLES=ask/INSTALL_SERWEB_TABLES=yes/g" openserctlrc
 
-# set the mysql root password
-cp openserdbctl.mysql openserdbctl.mysql.bak
-sed -i "s/#PW=""/PW="$PW"/g" openserdbctl.mysql
-
 ./openserdbctl create $tmp_name > /dev/null
 ret=$?
 
@@ -27,7 +23,6 @@ fi ;
 
 # cleanup
 mv openserctlrc.bak openserctlrc
-cp openserdbctl.mysql.bak openserdbctl.mysql
 
 cd ../test
 exit $ret