[sr-dev] git:master:f31d36e3: test/unit: update unit test 34

Module: kamailio Branch: master Commit: f31d36e31133175c7bf466e2ab9bbc4d7836496e URL: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-01-11T01:48:02+02:00 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 --- Modified: test/unit/34.cfg Modified: test/unit/34.sh --- Diff: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… Patch: https://github.com/kamailio/kamailio/commit/f31d36e31133175c7bf466e2ab9bbc4… --- diff --git a/test/unit/34.cfg b/test/unit/34.cfg index c9f7c0c..473bf10 100644 --- a/test/unit/34.cfg +++ b/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:bla@127.0.0.1") +modparam("pua_bla|pua_xmpp|rls", "server_address", "sip:bla@127.0.0.1") modparam("dialog", "dlg_flag", 10) diff --git a/test/unit/34.sh b/test/unit/34.sh index 8cce1da..adc8213 100755 --- a/test/unit/34.sh +++ b/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