Explorar el Código

- don't load dbtext mod in test 2, change cfg to not include mysql, do this in test
- add a new test that checks openser db related module startup with dbtext


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

Henning Westerholt hace 18 años
padre
commit
97fdb6765c
Se han modificado 3 ficheros con 21 adiciones y 3 borrados
  1. 19 0
      test/unit/15.sh
  2. 0 2
      test/unit/2.cfg
  3. 2 1
      test/unit/2.sh

+ 19 - 0
test/unit/15.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+# load all modules without external dependencies with dbtext
+
+CFG=2.cfg
+cp $CFG $CFG.bak
+
+echo "loadmodule \"dbtext/dbtext.so\"" >> $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\", \"dbtext://`pwd`/../scripts/dbtext/openser\")" >> $CFG
+# start
+../openser -f $CFG > /dev/null
+ret=$?
+
+sleep 1
+killall -9 openser
+
+mv $CFG.bak $CFG
+rm -f dispatcher.list
+
+exit $ret

+ 0 - 2
test/unit/2.cfg

@@ -7,7 +7,6 @@ loadmodule "auth_db/auth_db.so"
 loadmodule "avpops/avpops.so"
 loadmodule "benchmark/benchmark.so"
 loadmodule "cfgutils/cfgutils.so"
-loadmodule "dbtext/dbtext.so"
 loadmodule "dialog/dialog.so"
 loadmodule "dispatcher/dispatcher.so"
 loadmodule "diversion/diversion.so"
@@ -25,7 +24,6 @@ loadmodule "maxfwd/maxfwd.so"
 loadmodule "mi_datagram/mi_datagram.so"
 loadmodule "mi_fifo/mi_fifo.so"
 loadmodule "msilo/msilo.so"
-loadmodule "mysql/mysql.so"
 loadmodule "nathelper/nathelper.so"
 loadmodule "options/options.so"
 loadmodule "path/path.so"

+ 2 - 1
test/unit/2.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# load all modules without external dependencies
+# load all modules without external dependencies with mysql
 
 # Needs a default openser database setup for mysql
 
@@ -8,6 +8,7 @@ cp $CFG $CFG.bak
 
 touch dispatcher.list
 
+echo "loadmodule \"mysql/mysql.so\"" >> $CFG
 echo "modparam(\"dispatcher\", \"list_file\", \"`pwd`/../test/dispatcher.list\")" >> $CFG
 
 # start