- modify openserdbctl tests to set the 'TEST' variable

- fix some minor errors
- remove SERWEB specific stuff


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

test/unit/17.sh

@@ -36,11 +36,12 @@ 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
+
+cp openserdbctl openserdbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
 
 ./openserdbctl create $tmp_name > /dev/null
 ret=$?
@@ -56,6 +57,7 @@ killall -9 openser
 # cleanup
 ./openserdbctl drop $tmp_name > /dev/null
 mv openserctlrc.bak openserctlrc
+mv openserdbctl.bak openserdbctl
 
 cd ../test/
 rm $CFG

test/unit/3.sh

@@ -35,11 +35,12 @@ 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=MYSQL/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
+
+cp openserdbctl openserdbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
 
 # set the mysql root password
 cp openserdbctl.mysql openserdbctl.mysql.bak
@@ -55,7 +56,8 @@ fi ;
 
 # cleanup
 mv openserctlrc.bak openserctlrc
-cp openserdbctl.mysql.bak openserdbctl.mysql
+mv openserdbctl.mysql.bak openserdbctl.mysql
+mv openserdbctl.bak openserdbctl
 
 cd ../test
 exit $ret

test/unit/8.sh

@@ -25,11 +25,12 @@ 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=DBTEXT/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
+
+cp openserdbctl openserdbctl.bak
+sed -i "s/TEST=\"false\"/TEST=\"true\"/g" openserdbctl
 
 ./openserdbctl create $tmp_name > /dev/null
 ret=$?
@@ -41,6 +42,8 @@ fi ;
 
 # cleanup
 mv openserctlrc.bak openserctlrc
+mv openserdbctl.bak openserdbctl
+
 
 cd ../test
 exit $ret