[asterisk-commits] mnick: testsuite/asterisk/trunk r631 - in /asterisk/trunk/tests/blind-transfe...

[SVN commits to the Asterisk project]

Author: mnick
Date: Thu Jul 29 08:29:21 2010
New Revision: 631

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=631
Log:
added some changes

Removed:
    asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/logger.conf
    asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/logger.conf
Modified:
    asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/iax.conf
    asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/iax.conf
    asterisk/trunk/tests/blind-transfer-parkingtimeout/run-test

Modified: asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/iax.conf?view=diff&rev=631&r1=630&r2=631
==============================================================================
--- asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/iax.conf (original)
+++ asterisk/trunk/tests/blind-transfer-parkingtimeout/configs/iax.conf Thu Jul 29 08:29:21 2010
@@ -13,16 +13,3 @@
 host=127.0.0.1
 port=4570
 context=parking
-requirecalltoken=no
-
-[userB]
-type=friend
-host=127.0.0.1
-port=4571
-context=parking
-requirecalltoken=no
-
-
-
-
-

Modified: asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/iax.conf?view=diff&rev=631&r1=630&r2=631
==============================================================================
--- asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/iax.conf (original)
+++ asterisk/trunk/tests/blind-transfer-parkingtimeout/configs2/iax.conf Thu Jul 29 08:29:21 2010
@@ -8,22 +8,8 @@
 jitterbuffer=no
 forcejitterbuffer=no
 
-
-
 [userA]
 type=friend
 host=127.0.0.1
 port=4570
 context=parking
-requirecalltoken=no
-
-[userB]
-type=friend
-host=127.0.0.1
-port=4571
-context=parking
-requirecalltoken=no
-
-
-
-

Modified: asterisk/trunk/tests/blind-transfer-parkingtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/blind-transfer-parkingtimeout/run-test?view=diff&rev=631&r1=630&r2=631
==============================================================================
--- asterisk/trunk/tests/blind-transfer-parkingtimeout/run-test (original)
+++ asterisk/trunk/tests/blind-transfer-parkingtimeout/run-test Thu Jul 29 08:29:21 2010
@@ -45,13 +45,10 @@
         self.asterisk1.install_config("tests/blind-transfer-parkingtimeout/configs/extensions.conf")
         self.asterisk1.install_config("tests/blind-transfer-parkingtimeout/configs/iax.conf")
         self.asterisk1.install_config("tests/blind-transfer-parkingtimeout/configs/features.conf")
-        self.asterisk1.install_config("tests/blind-transfer-parkingtimeout/configs/logger.conf")
 
         self.asterisk2 = Asterisk(base="/tmp/asterisk-testsuite/blind-transfer-parkingtimeout/asterisk2")
         self.asterisk2.install_config("tests/blind-transfer-parkingtimeout/configs2/extensions.conf")
         self.asterisk2.install_config("tests/blind-transfer-parkingtimeout/configs2/iax.conf")
-        self.asterisk2.install_config("tests/blind-transfer-parkingtimeout/configs2/logger.conf")
-
 
    # This gets invoked by the dialplan when test succeeds.
     def get_result_b(self, agi):
@@ -97,10 +94,7 @@
         self.asterisk1.cli_exec("core set verbose 10")
 
         self.log_last_step("Originating call to begin test")
-        if self.ast_version < AsteriskVersion("1.6.2"):
-            self.asterisk1.cli_exec("originate IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
-        else:
-            self.asterisk1.cli_exec("channel originate IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
+        self.asterisk1.cli_originate("IAX2/userA at 127.0.0.1:4571/b_exten extension a_dials at parking")
 
     def start_asterisk(self):
         self.log_last_step("Starting Asterisk")