Skip to content

Commit

Permalink
test/unit: update unit test 34
Browse files Browse the repository at this point in the history
- sh instead of bash
- pua_mi is not part of Kamailio anymore
- server_address is mandatory parameter for rls
  • Loading branch information
mslehto committed Jan 10, 2017
1 parent ff6ce3b commit f31d36e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions test/unit/34.cfg
Expand Up @@ -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"
Expand All @@ -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:bla@127.0.0.1")
modparam("pua_bla|pua_xmpp|rls", "server_address", "sip:bla@127.0.0.1")
modparam("dialog", "dlg_flag", 10)
12 changes: 6 additions & 6 deletions 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
Expand All @@ -21,17 +21,17 @@

# 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

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
Expand All @@ -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
Expand Down

0 comments on commit f31d36e

Please sign in to comment.