[svn-commits] mnick: branch mnick/gsoc2010 r759 - in /asterisk/team/mnick/gsoc2010/trunk/te...

[SVN commits to the Digium repositories]

Author: mnick
Date: Wed Aug 18 11:23:15 2010
New Revision: 759

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=759
Log:
changed some code

Removed:
    asterisk/team/mnick/gsoc2010/trunk/tests/callparking/configs/logger.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/callparking/configs2/logger.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/callparking/configs3/logger.conf
Modified:
    asterisk/team/mnick/gsoc2010/trunk/tests/callparking/run-test

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/callparking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/callparking/run-test?view=diff&rev=759&r1=758&r2=759
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/callparking/run-test (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/callparking/run-test Wed Aug 18 11:23:15 2010
@@ -73,7 +73,7 @@
          "Initiate new call between userB and userC now")
         self.asterisk1.cli_originate(
          "IAX2/userB at 127.0.0.1:4572/c_exten extension bridge_to_B at parking")
-        return self.finish_agi(agi)
+        return agi.finish()
 
     # This gets invoked by the dialplan when userC has parked userB to 702.
     # Initiate new call between userC and parked userA (@701) now.
@@ -82,7 +82,7 @@
          "Now retrieve userA -> call 701")
         self.asterisk3.cli_originate(
          "IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
-        return self.finish_agi(agi)
+        return agi.finish()
 
     # This gets invoked by the dialplan when userC has retrieved userA.
     # Initiate new call between userC and parked userB (@702) now.
@@ -91,7 +91,7 @@
          "userA retrieved successfully, now retrieve userB")
         self.asterisk3.cli_originate(
          "IAX2/userA at 127.0.0.1:4570/702 extension retrieve_B at parking")
-        return self.finish_agi(agi)
+        return agi.finish()
 
     # This gets invoked by the dialplan when userC has retrieved userB.
     # Test successful!
@@ -100,13 +100,7 @@
          "userB retrieved successfully -> Test successful")
         self.passed = True
         reactor.callLater(2, self.read_result)
-        return self.finish_agi(agi)
-
-    # Finish the AGI connection
-    def finish_agi(self, agi):
-        sequence = fastagi.InSequence()
-        sequence.append(agi.finish)
-        return sequence()
+        return agi.finish()
 
     def read_result(self):
         if self.done: