[asterisk-commits] pabelanger: branch pabelanger/DefaultManagerEnabled r2043 - in /asterisk/team...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Aug 30 17:16:29 CDT 2011


Author: pabelanger
Date: Tue Aug 30 17:16:25 2011
New Revision: 2043

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2043
Log:
First round up updates

Removed:
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_attendant_exit/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_attendant_exit/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_context_operator_exit/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_context_operator_exit/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_operator_exit/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/directory_operator_exit/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/voicemail/leave_voicemail_nominal/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/apps/voicemail/leave_voicemail_nominal/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/callparking/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/callparking/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/cdr/console_dial_sip_answer/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/channels/SIP/noload_res_srtp_attempt_srtp/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/channels/SIP/sip_tls_call/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/channels/SIP/sip_tls_call/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fastagi/channel-status/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fastagi/connect/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fastagi/control-stream-file/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fastagi/database/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fastagi/stream-file/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_g711_t38/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_g711_t38/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix1/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix1/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix2/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix2/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix3/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix3/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix4/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_mix4/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_native_t38/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_native_t38/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_native_t38_ced/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_native_t38_ced/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_no_t38/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_no_t38/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_t38_g711/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_t38_g711/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout1/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout1/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout2/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout2/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout3/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout3/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout4/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout4/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout5/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/fax/gateway_timeout5/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/func_srv/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/manager/login/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/merge_contexts/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/merge_contexts/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/pbx_lua_background/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/pbx_lua_background/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/pbx_lua_goto/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/pbx/pbx_lua_goto/configs/ast2/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/regressions/M18882/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/udptl/configs/ast1/manager.general.conf.inc
    asterisk/team/pabelanger/DefaultManagerEnabled/tests/udptl/configs/ast2/manager.general.conf.inc
Modified:
    asterisk/team/pabelanger/DefaultManagerEnabled/configs/manager.conf
    asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/TestCase.py
    asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/asterisk.py

Modified: asterisk/team/pabelanger/DefaultManagerEnabled/configs/manager.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/DefaultManagerEnabled/configs/manager.conf?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- asterisk/team/pabelanger/DefaultManagerEnabled/configs/manager.conf (original)
+++ asterisk/team/pabelanger/DefaultManagerEnabled/configs/manager.conf Tue Aug 30 17:16:25 2011
@@ -1,5 +1,5 @@
 [general]
-enabled = no
+enabled = yes
 port = 5038
 bindaddr = 127.0.0.1
 

Modified: asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/TestCase.py?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/TestCase.py Tue Aug 30 17:16:25 2011
@@ -60,6 +60,8 @@
             # Copy test specific config files
             self.ast[c].install_configs("%s/configs/ast%d" %
                     (self.test_name, c + 1))
+            host = "bindaddr = 127.0.0.2"
+            self.ast[c].append_config("manager.general.conf.inc", host)
 
     def create_ami_factory(self, count=1, username="user", secret="mysecret", port=5038):
         """

Modified: asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/asterisk.py?view=diff&rev=2043&r1=2042&r2=2043
==============================================================================
--- asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/pabelanger/DefaultManagerEnabled/lib/python/asterisk/asterisk.py Tue Aug 30 17:16:25 2011
@@ -249,6 +249,24 @@
             logger.warn("'%s' and '%s' are the same file" % (cfg_path, target_path))
         except IOError:
             logger.warn("The destination is not writable '%s'" % target_path)
+
+    def append_config(self, filename, value):
+        target_filename = os.path.join(self.astetcdir, filename)
+
+        if not os.path.exists(target_filename):
+            logger.error("File '%s' does not exists" % filename)
+            return
+        try:
+            f = open(target_filename, "w")
+        except IOError:
+            logger.error("Failed to open %s" % target_filename)
+            return
+        except:
+            logger.error("Unexpected error: %s" % sys.exc_info()[0])
+            return
+
+        f.write(value)
+        f.close()
 
     def cli_originate(self, argstr, blocking=True):
         """Starts a call from the CLI and links it to an application or




More information about the asterisk-commits mailing list