[svn-commits] pabelanger: branch pabelanger/testClass r1155 - in /asterisk/team/pabelanger/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Dec 13 15:14:29 CST 2010
Author: pabelanger
Date: Mon Dec 13 15:14:25 2010
New Revision: 1155
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1155
Log:
First round of config file updates. Set bindaddr=127.0.0.1 by default
Use #exec over #include
Added:
asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf (with props)
asterisk/team/pabelanger/testClass/configs/dundi.conf (with props)
asterisk/team/pabelanger/testClass/configs/gtalk.conf (with props)
asterisk/team/pabelanger/testClass/configs/h323.conf (with props)
asterisk/team/pabelanger/testClass/configs/http.conf (with props)
asterisk/team/pabelanger/testClass/configs/iax.conf (with props)
asterisk/team/pabelanger/testClass/configs/jingle.conf (with props)
asterisk/team/pabelanger/testClass/configs/manager.conf (with props)
asterisk/team/pabelanger/testClass/configs/mgcp.conf (with props)
asterisk/team/pabelanger/testClass/configs/sip.conf (with props)
asterisk/team/pabelanger/testClass/configs/skinny.conf (with props)
Removed:
asterisk/team/pabelanger/testClass/configs/logger.general.conf.inc
asterisk/team/pabelanger/testClass/configs/logger.logfiles.conf.inc
Modified:
asterisk/team/pabelanger/testClass/configs/asterisk.options.conf.inc
asterisk/team/pabelanger/testClass/configs/logger.conf
asterisk/team/pabelanger/testClass/lib/python/asterisk/asterisk.py
Modified: asterisk/team/pabelanger/testClass/configs/asterisk.options.conf.inc
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/asterisk.options.conf.inc?view=diff&rev=1155&r1=1154&r2=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/asterisk.options.conf.inc (original)
+++ asterisk/team/pabelanger/testClass/configs/asterisk.options.conf.inc Mon Dec 13 15:14:25 2010
@@ -4,3 +4,4 @@
verbose = 15
nocolor = yes
dumpcore = yes
+execincludes = yes
Added: asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,3 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat chan_ooh323.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/chan_ooh323.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/dundi.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/dundi.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/dundi.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/dundi.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,6 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat dundi.general.conf.inc 2> /dev/null"
+
+[mappings]
+#exec "cat dundi.mappings.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/dundi.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/dundi.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/dundi.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/gtalk.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/gtalk.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/gtalk.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/gtalk.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,3 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat gtalk.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/gtalk.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/gtalk.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/gtalk.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/h323.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/h323.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/h323.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/h323.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,3 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat h323.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/h323.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/h323.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/h323.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/http.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/http.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/http.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/http.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,7 @@
+[general]
+bindaddr=127.0.0.1
+tlsbindaddr=127.0.0.1
+#exec "cat http.general.conf.inc 2> /dev/null"
+
+[post_mappings]
+#exec "cat http.post_mappings.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/http.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/http.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/http.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/iax.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/iax.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/iax.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,5 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat iax.general.conf 2> /dev/null"
+
+; XXX What do we name the file to include peers / friends?
Propchange: asterisk/team/pabelanger/testClass/configs/iax.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/iax.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/iax.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/jingle.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/jingle.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/jingle.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/jingle.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,3 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat jingle.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/jingle.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/jingle.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/jingle.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/team/pabelanger/testClass/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/logger.conf?view=diff&rev=1155&r1=1154&r2=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/logger.conf (original)
+++ asterisk/team/pabelanger/testClass/configs/logger.conf Mon Dec 13 15:14:25 2010
@@ -4,10 +4,10 @@
; so tests have the ability to overwrite them.
;
[general]
-#include "logger.general.conf.inc"
+#exec "cat logger.general.conf.inc 2> /dev/null"
[logfiles]
console => verbose
messages => notice,warning,error,verbose
full => *
-#include "logger.logfiles.conf.inc"
+#exec "cat logger.logfiles.conf.inc 2> /dev/null"
Added: asterisk/team/pabelanger/testClass/configs/manager.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/manager.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/manager.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/manager.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,7 @@
+[general]
+enabled = yes
+webenabled = no
+
+bindaddr = 127.0.0.1
+port = 5038
+#exec "cat /tmp/manager.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/manager.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/manager.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/manager.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/mgcp.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/mgcp.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/mgcp.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/mgcp.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,3 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat mgcp.general.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/mgcp.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/mgcp.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/mgcp.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/sip.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/sip.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/sip.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,8 @@
+[general]
+udpbindaddr=127.0.0.1
+tcpbindaddr=127.0.0.1
+tlsbindaddr=127.0.0.1
+#exec "cat sip.general.conf.inc 2> /dev/null"
+
+[authentication]
+#exec "cat sip.authentication.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/sip.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/sip.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/sip.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: asterisk/team/pabelanger/testClass/configs/skinny.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/configs/skinny.conf?view=auto&rev=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/configs/skinny.conf (added)
+++ asterisk/team/pabelanger/testClass/configs/skinny.conf Mon Dec 13 15:14:25 2010
@@ -1,0 +1,9 @@
+[general]
+bindaddr=127.0.0.1
+#exec "cat skinny.general.conf.inc 2> /dev/null"
+
+[lines]
+#exec "cat skinny.lines.conf.inc 2> /dev/null"
+
+[devices]
+#exec "cat skinny.devices.conf.inc 2> /dev/null"
Propchange: asterisk/team/pabelanger/testClass/configs/skinny.conf
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: asterisk/team/pabelanger/testClass/configs/skinny.conf
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: asterisk/team/pabelanger/testClass/configs/skinny.conf
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: asterisk/team/pabelanger/testClass/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/testClass/lib/python/asterisk/asterisk.py?view=diff&rev=1155&r1=1154&r2=1155
==============================================================================
--- asterisk/team/pabelanger/testClass/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/testClass/lib/python/asterisk/asterisk.py Mon Dec 13 15:14:25 2010
@@ -43,7 +43,7 @@
asterisk.conf.
"""
- def __init__(self, base=None, ast_conf_options=None):
+ def __init__(self, base=None, ast_conf_options=None, host="127.0.0.1"):
"""Construct an Asterisk instance.
Keyword Arguments:
@@ -60,6 +60,7 @@
self.base = "/tmp/asterisk-testsuite"
self.astetcdir = "/etc/asterisk"
self.ast_binary = utils.which("asterisk") or "/usr/sbin/asterisk"
+ self.host = host
# Find the system installed asterisk.conf
ast_confs = [
More information about the svn-commits
mailing list