[asterisk-commits] mjordan: testsuite/asterisk/trunk r2386 - in /asterisk/trunk/tests: apps/inco...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Sep 20 09:51:04 2011
New Revision: 2386

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2386
Log:
Cleanup, removed redundant manager.general.conf.inc

Removed:
    asterisk/trunk/tests/apps/incomplete/sip_incomplete/configs/ast1/manager.general.conf.inc
    asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/configs/ast1/manager.general.conf.inc
Modified:
    asterisk/trunk/tests/apps/incomplete/sip_incomplete/run-test
    asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/run-test

Modified: asterisk/trunk/tests/apps/incomplete/sip_incomplete/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/incomplete/sip_incomplete/run-test?view=diff&rev=2386&r1=2385&r2=2386
==============================================================================
--- asterisk/trunk/tests/apps/incomplete/sip_incomplete/run-test (original)
+++ asterisk/trunk/tests/apps/incomplete/sip_incomplete/run-test Tue Sep 20 09:51:04 2011
@@ -33,7 +33,7 @@
 class SipIncompleteTest(TestCase):
     def __init__(self):
         TestCase.__init__(self)
-        self.create_asterisk(1)
+        self.create_asterisk()
         self.receiverTest = SIPpScenario(TEST_DIR, Receiver_Scenario)
         self.senderTest = SIPpScenario(TEST_DIR, Sender_Scenario)
 
@@ -74,8 +74,7 @@
 
     def run(self):
         TestCase.run(self)
-        logger.debug("Creating AMI factory")
-        self.create_ami_factory(1)
+        self.create_ami_factory()
 
 
 def main():

Modified: asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/run-test?view=diff&rev=2386&r1=2385&r2=2386
==============================================================================
--- asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/handle_response_address_incomplete/run-test Tue Sep 20 09:51:04 2011
@@ -29,7 +29,7 @@
 class HandleResponseAddressIncomplete(TestCase):
     def __init__(self):
         TestCase.__init__(self)
-        self.create_asterisk(1)
+        self.create_asterisk()
         self.sipTest = SIPpScenario(TEST_DIR, SIPP_SCENARIO)
 
 
@@ -45,13 +45,6 @@
         logger.debug("Originating call from local channel to SIPp peer")
         df = ami.originate("Local/1234 at default", "default", "1234", 1, None, "CallId", None, None, None, {}, True)
         df.addErrback(self.handleOriginateFailure)
-
-    def handleOriginateFailure(self, reason):
-        logger.error("Error sending originate:")
-        logger.error(reason.getTraceback())
-        self.stop_reactor()
-
-        return reason
 
     def user_event(self, ami, event):
         if event['userevent'] != 'TestResult':
@@ -80,7 +73,7 @@
     def run(self):
         TestCase.run(self)
         logger.debug("Creating AMI factory")
-        self.create_ami_factory(1)
+        self.create_ami_factory()
 
 
 def main():