[asterisk-commits] pabelanger: branch pabelanger/ami_connect r2164 - in /asterisk/team/pabelange...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Sep 9 15:59:05 CDT 2011


Author: pabelanger
Date: Fri Sep  9 15:59:01 2011
New Revision: 2164

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2164
Log:
Create a virtual ami_connect method

Modified:
    asterisk/team/pabelanger/ami_connect/lib/python/asterisk/TestCase.py
    asterisk/team/pabelanger/ami_connect/tests/apps/directory_attendant_exit/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/directory_context_operator_exit/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/directory_operator_exit/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/authenticate_nominal/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_new_user/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_nominal/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/func_vmcount/run-test
    asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/leave_voicemail_nominal/run-test
    asterisk/team/pabelanger/ami_connect/tests/callparking/run-test
    asterisk/team/pabelanger/ami_connect/tests/cdr/console_dial_sip_answer/run-test
    asterisk/team/pabelanger/ami_connect/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
    asterisk/team/pabelanger/ami_connect/tests/channels/SIP/sip_tls_call/run-test
    asterisk/team/pabelanger/ami_connect/tests/directed_pickup/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_g711_t38/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix1/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix2/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix3/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix4/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38_ced/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_no_t38/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_t38_g711/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout1/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout2/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout3/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout4/run-test
    asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout5/run-test
    asterisk/team/pabelanger/ami_connect/tests/func_srv/run-test
    asterisk/team/pabelanger/ami_connect/tests/manager/login/run-test
    asterisk/team/pabelanger/ami_connect/tests/pbx/merge_contexts/run-test
    asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_background/run-test
    asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_goto/run-test
    asterisk/team/pabelanger/ami_connect/tests/regressions/M18882/run-test
    asterisk/team/pabelanger/ami_connect/tests/udptl/run-test

Modified: asterisk/team/pabelanger/ami_connect/lib/python/asterisk/TestCase.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/lib/python/asterisk/TestCase.py?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/lib/python/asterisk/TestCase.py (original)
+++ asterisk/team/pabelanger/ami_connect/lib/python/asterisk/TestCase.py Fri Sep  9 15:59:01 2011
@@ -58,10 +58,10 @@
             self.ast.append(Asterisk(base=self.base, host=host))
             # Copy shared config files
             self.ast[c].install_configs("%s/configs" %
-                    (self.test_name))
+                (self.test_name))
             # Copy test specific config files
             self.ast[c].install_configs("%s/configs/ast%d" %
-                    (self.test_name, c + 1))
+                (self.test_name, c + 1))
 
     def create_ami_factory(self, count=1, username="user", secret="mysecret", port=5038):
         """
@@ -71,25 +71,26 @@
         username --
         secret --
         port --
-
         """
         for c in range(count):
             host = "127.0.0.%d" % (c + 1)
             self.ami.append(None)
             logger.info("Creating AMIFactory %d" % (c + 1))
             self.ami_factory = manager.AMIFactory(username, secret, c)
-            self.ami_factory.login(host).addCallbacks(self.ami_connect,
-                    self.ami_login_error)
+            self.ami_factory.login(host).addCallbacks(self.__ami_connect,
+                self.ami_login_error)
 
     def create_fastagi_factory(self, count=1):
+        """
 
+        """
         for c in range(count):
             host = "127.0.0.%d" % (c + 1)
             self.fastagi.append(None)
             logger.info("Creating FastAGI Factory %d" % (c + 1))
             self.fastagi_factory = fastagi.FastAGIFactory(self.fastagi_connect)
             reactor.listenTCP(4573, self.fastagi_factory,
-                    self.reactor_timeout, host)
+                self.reactor_timeout, host)
 
     def start_asterisk(self):
         """
@@ -116,10 +117,10 @@
             reactor.stop()
 
     def __reactor_timeout(self):
-        '''
+        """
         A wrapper function for stop_reactor(), so we know when a reactor timeout
         has occurred.
-        '''
+        """
         logger.warning("Reactor timeout: '%s' seconds" % self.reactor_timeout)
         self.stop_reactor()
 
@@ -135,8 +136,16 @@
         self.stop_reactor()
 
     def ami_connect(self, ami):
+        """
+        Hook method used after create_ami_factory() successfully logs into
+        the Asterisk AMI.
+        """
+        pass
+
+    def __ami_connect(self, ami):
         logger.info("AMI Connect instance %s" % (ami.id + 1))
         self.ami[ami.id] = ami
+        self.ami_connect(self, ami)
 
     def handleOriginateFailure(self, reason):
         """ Convenience callback handler for twisted deferred errors for an AMI originate call """

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/directory_attendant_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/directory_attendant_exit/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/directory_attendant_exit/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/directory_attendant_exit/run-test Fri Sep  9 15:59:01 2011
@@ -27,8 +27,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       ami.registerEvent('UserEvent', self.user_event)
 
       if ami.id == 0:

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/directory_context_operator_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/directory_context_operator_exit/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/directory_context_operator_exit/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/directory_context_operator_exit/run-test Fri Sep  9 15:59:01 2011
@@ -27,8 +27,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       ami.registerEvent('UserEvent', self.user_event)
 
       if ami.id == 0:

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/directory_operator_exit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/directory_operator_exit/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/directory_operator_exit/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/directory_operator_exit/run-test Fri Sep  9 15:59:01 2011
@@ -27,8 +27,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       ami.registerEvent('UserEvent', self.user_event)
 
       if ami.id == 0:

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/authenticate_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/authenticate_nominal/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/authenticate_nominal/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/authenticate_nominal/run-test Fri Sep  9 15:59:01 2011
@@ -37,8 +37,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        super(AuthenticateNominal, self).ami_connect(ami)
-
         ami.registerEvent('UserEvent', self.user_event)
 
         if not (ami.id == 0):

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_new_user/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_new_user/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_new_user/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_new_user/run-test Fri Sep  9 15:59:01 2011
@@ -230,8 +230,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        super(CheckVoicemailNewUser, self).ami_connect(ami)
-
         """ Record which AMI instance we've received and attempt to set up the test controller """
         if (ami.id == 0):
             self.amiReceiver = ami

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_nominal/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_nominal/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/check_voicemail_nominal/run-test Fri Sep  9 15:59:01 2011
@@ -301,8 +301,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        super(CheckVoicemailNominal, self).ami_connect(ami)
-
         """ Record which AMI instance we've received and attempt to set up the test controller """
         if (ami.id == 0):
             self.amiReceiver = ami

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/func_vmcount/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/func_vmcount/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/func_vmcount/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/func_vmcount/run-test Fri Sep  9 15:59:01 2011
@@ -45,8 +45,6 @@
         self.create_asterisk(1)
 
     def ami_connect(self, ami):
-        super(FuncVmCount, self).ami_connect(ami)
-
         self.passed = False
 
         """

Modified: asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/leave_voicemail_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/leave_voicemail_nominal/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/leave_voicemail_nominal/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/apps/voicemail/leave_voicemail_nominal/run-test Fri Sep  9 15:59:01 2011
@@ -36,8 +36,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        super(LeaveVoicemailNominal, self).ami_connect(ami)
-
         self.audioFile = os.path.join(os.getcwd(), "%s/sounds/talking" % (self.testParentDir))
 
         ami.registerEvent('UserEvent', self.user_event)

Modified: asterisk/team/pabelanger/ami_connect/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/callparking/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/callparking/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/callparking/run-test Fri Sep  9 15:59:01 2011
@@ -59,8 +59,6 @@
         self.check_result()
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
-
         if ami.id == 0:
             self.ami[ami.id].registerEvent("ParkedCall", self.ast1_parkedcall)
             self.ami[ami.id].registerEvent("UnParkedCall", self.ast1_unparkedcall)

Modified: asterisk/team/pabelanger/ami_connect/tests/cdr/console_dial_sip_answer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/cdr/console_dial_sip_answer/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/cdr/console_dial_sip_answer/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/cdr/console_dial_sip_answer/run-test Fri Sep  9 15:59:01 2011
@@ -24,8 +24,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
-
         if ami.id == 0:
             self.ami[0].registerEvent('Hangup', self.end)
             self.ami[0].originate(channel = "Local/1 at default", application = "Echo")

Modified: asterisk/team/pabelanger/ami_connect/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/channels/SIP/noload_res_srtp_attempt_srtp/run-test Fri Sep  9 15:59:01 2011
@@ -42,8 +42,6 @@
 
     # Once the AMI Factory connects to Asterisk, this function fires.
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
-
         print "AMI - connected"
 
         # Register for the AMI event we are interested in.

Modified: asterisk/team/pabelanger/ami_connect/tests/channels/SIP/sip_tls_call/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/channels/SIP/sip_tls_call/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/channels/SIP/sip_tls_call/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/channels/SIP/sip_tls_call/run-test Fri Sep  9 15:59:01 2011
@@ -59,8 +59,6 @@
 
     # Once the AMI Factory connects to the AMI, this function fires.
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
-
         print "AMI %d - connected, registering DTMF event..." % (ami.id + 1)
 
         # This will make the manager listen for DTMF and callback ami_test when it sees some.

Modified: asterisk/team/pabelanger/ami_connect/tests/directed_pickup/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/directed_pickup/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/directed_pickup/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/directed_pickup/run-test Fri Sep  9 15:59:01 2011
@@ -71,7 +71,6 @@
         self.firstChannel = event.get('channel')
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
         self.ami[0].registerEvent("Dial", self.check_Dial)
         self.ami[0].registerEvent("UserEvent", self.check_UserEvent)
         self.ami[0].originate(

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_g711_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_g711_t38/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_g711_t38/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_g711_t38/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix1/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix1/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix1/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix1/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix2/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix2/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix2/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix2/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix3/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix3/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix3/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix3/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix4/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix4/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix4/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_mix4/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38_ced/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38_ced/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38_ced/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_native_t38_ced/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_no_t38/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_no_t38/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_no_t38/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_no_t38/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_t38_g711/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_t38_g711/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_t38_g711/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_t38_g711/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout1/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout1/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout1/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout1/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout2/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout2/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout2/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout2/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout3/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout3/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout3/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout3/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout4/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout4/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout4/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout4/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout5/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout5/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout5/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/fax/gateway_timeout5/run-test Fri Sep  9 15:59:01 2011
@@ -32,8 +32,6 @@
       shutil.copy("%s/send.tiff" % (os.path.dirname(os.path.realpath(__file__)),), "%s%s" % (self.ast[0].base, self.ast[0].directories['astdatadir']))
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/func_srv/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/func_srv/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/func_srv/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/func_srv/run-test Fri Sep  9 15:59:01 2011
@@ -45,12 +45,8 @@
         self.create_asterisk()
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
-
         self.ami[0].registerEvent("UserEvent", self.analyze_srv)
-
         self.ami[0].originate(channel = "Local/test at test_context", application = "Echo")
-
         self.ami[0].originate(channel = "Local/test2 at test_context", application = "Echo")
 
     def analyze_srv(self, ami, event):

Modified: asterisk/team/pabelanger/ami_connect/tests/manager/login/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/manager/login/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/manager/login/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/manager/login/run-test Fri Sep  9 15:59:01 2011
@@ -23,8 +23,7 @@
         self.passed = True
         self.stop_reactor()
 
-    def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
+    def ami_connect(self):
         self.ami[0].logoff().addCallbacks(self.ami_logoff, self.ami_login_error)
 
     def run(self):

Modified: asterisk/team/pabelanger/ami_connect/tests/pbx/merge_contexts/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/pbx/merge_contexts/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/pbx/merge_contexts/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/pbx/merge_contexts/run-test Fri Sep  9 15:59:01 2011
@@ -28,8 +28,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a calls from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_background/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_background/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_background/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_background/run-test Fri Sep  9 15:59:01 2011
@@ -26,8 +26,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_goto/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_goto/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_goto/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/pbx/pbx_lua_goto/run-test Fri Sep  9 15:59:01 2011
@@ -26,8 +26,6 @@
       self.create_asterisk(2)
 
    def ami_connect(self, ami):
-      TestCase.ami_connect(self, ami)
-
       if ami.id == 0:
 
          print "sending a call from ast1 to ast2"

Modified: asterisk/team/pabelanger/ami_connect/tests/regressions/M18882/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/regressions/M18882/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/regressions/M18882/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/regressions/M18882/run-test Fri Sep  9 15:59:01 2011
@@ -30,7 +30,6 @@
         self.stop_reactor()
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
         self.ami[0].dbPut(self.family, self.key, self.value).addCallbacks(self.ami_dbGet)
 
     def ami_dbGet(self, ami):

Modified: asterisk/team/pabelanger/ami_connect/tests/udptl/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/ami_connect/tests/udptl/run-test?view=diff&rev=2164&r1=2163&r2=2164
==============================================================================
--- asterisk/team/pabelanger/ami_connect/tests/udptl/run-test (original)
+++ asterisk/team/pabelanger/ami_connect/tests/udptl/run-test Fri Sep  9 15:59:01 2011
@@ -22,7 +22,6 @@
         self.create_asterisk(2)
 
     def ami_connect(self, ami):
-        TestCase.ami_connect(self, ami)
         if ami.id == 0:
             self.ami[0].originate(channel = "SIP/666 at receiver",
                     application = "SendFax",




More information about the asterisk-commits mailing list