Просмотр исходного кода

test/unit: update unit test 34

- sh instead of bash
- pua_mi is not part of Kamailio anymore
- server_address is mandatory parameter for rls
Mikko Lehto 8 лет назад
Родитель
Сommit
f31d36e311
2 измененных файлов с 9 добавлено и 8 удалено
  1. 3 2
      test/unit/34.cfg
  2. 6 6
      test/unit/34.sh

+ 3 - 2
test/unit/34.cfg

@@ -6,7 +6,6 @@ loadmodule "presence_xml.so"
 loadmodule "presence_mwi.so"
 loadmodule "pua.so"
 loadmodule "pua_bla.so"
-loadmodule "pua_mi.so"
 loadmodule "pua_usrloc.so"
 loadmodule "xmpp.so"
 loadmodule "pua_xmpp.so"
@@ -16,10 +15,12 @@ loadmodule "presence_dialoginfo.so"
 loadmodule "rr.so"
 loadmodule "dialog.so"
 loadmodule "pua_dialoginfo.so"
+loadmodule "pv.so"
 
+modparam("xmpp", "xmpp_host", "example.invalid");
 modparam("rls", "xcap_root", "http://localhost/xcap-root:8000")
 modparam("presence_xml", "integrated_xcap_server", 1)
 modparam("pua_bla|pua_usrloc", "default_domain", "localhost")
 modparam("pua_bla", "header_name", "Sender")
-modparam("pua_bla|pua_xmpp", "server_address", "sip:[email protected]")
+modparam("pua_bla|pua_xmpp|rls", "server_address", "sip:[email protected]")
 modparam("dialog", "dlg_flag", 10)

+ 6 - 6
test/unit/34.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # load all presence related modules with mysql
 
 # Copyright (C) 2008 1&1 Internet AG
@@ -21,9 +21,9 @@
 
 # Needs a default kamailio database setup for mysql
 
-source include/common
-source include/require
-source include/database
+. include/common
+. include/require.sh
+. include/database.sh
 
 CFG=34.cfg
 
@@ -31,7 +31,7 @@ if ! (check_kamailio && check_module "db_mysql" && check_module "presence" \
 		&& check_module "presence_xml" && check_module "pua" \
 		&& check_module "xcap_client" && check_module "rls" \
 		&& check_module "presence_mwi" && check_module "pua_bla" \
-		&& check_module "pua_mi" && check_module "pua_usrloc" \
+		&& check_module "pua_usrloc" \
 		&& check_module "pua_xmpp" && check_module "xmpp" \
 		&& check_module "presence_dialoginfo" && check_module "pua_dialoginfo" \
 		&& check_mysql); then
@@ -43,7 +43,7 @@ cp $CFG $CFG.bak
 echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 
 # start
-$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 -a no > /dev/null
 ret=$?
 
 sleep 1