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

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Jul 29 07:29:10 CDT 2010


Author: mnick
Date: Thu Jul 29 07:29:06 2010
New Revision: 630

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=630
Log:
improved version

Modified:
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/iax.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/extensions.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/iax.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf
    asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/features.conf Thu Jul 29 07:29:06 2010
@@ -5,5 +5,5 @@
 parkingtime => 45		; Number of seconds a call can be parked for 
 
 [featuremap]
-parkcall => *        ; Park call (one step parking)  -- Make sure to set the K and/or k option in the Dial() app call!
+parkcall => #72        ; Park call (one step parking)  -- Make sure to set the K and/or k option in the Dial() app call!
 

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/iax.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/iax.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/iax.conf Thu Jul 29 07:29:06 2010
@@ -14,16 +14,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/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs/logger.conf Thu Jul 29 07:29:06 2010
@@ -91,7 +91,7 @@
 ;debug => debug
 console => notice,warning,error,verbose
 ;console => notice,warning,error,debug
-messages => notice,warning,error,verbose
+messages => notice,warning,error,verbose,dtmf
 ;full => notice,warning,error,debug,verbose
 
 ;syslog keyword : This special keyword logs to syslog facility 

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/extensions.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/extensions.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/extensions.conf Thu Jul 29 07:29:06 2010
@@ -11,10 +11,9 @@
 exten => b_exten,n,Wait(2)
 exten => b_exten,n,NOOP(trying to park the call- one step parking)
 exten => b_exten,n,SET(GLOBAL(lastaction)=park)
-exten => b_exten,n,SendDTMF(*)
+exten => b_exten,n,SendDTMF(#w7w2)
 exten => b_exten,n,Wait(2)
 exten => b_exten,n,Hangup()
-
 
 exten => h,1,GotoIF($["${GLOBAL(lastaction)}"="park"]?retrieve)
 exten => h,n,Hangup()

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/iax.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/iax.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/iax.conf Thu Jul 29 07:29:06 2010
@@ -9,22 +9,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/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/configs2/logger.conf Thu Jul 29 07:29:06 2010
@@ -91,7 +91,7 @@
 ;debug => debug
 console => notice,warning,error,verbose
 ;console => notice,warning,error,debug
-messages => notice,warning,error,verbose
+messages => notice,warning,error,verbose,dtmf
 ;full => notice,warning,error,debug,verbose
 
 ;syslog keyword : This special keyword logs to syslog facility 

Modified: asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test?view=diff&rev=630&r1=629&r2=630
==============================================================================
--- asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test (original)
+++ asterisk/team/mnick/gsoc2010/trunk/tests/one-step-parking/run-test Thu Jul 29 07:29:06 2010
@@ -42,13 +42,13 @@
         reactor.callWhenRunning(self.run)
 
         print self.ast_version
-        self.asterisk1 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/one-step-parking/asterisk1"))
+        self.asterisk1 = Asterisk(base="/tmp/asterisk-testsuite/one-step-parking")
         self.asterisk1.install_config("tests/one-step-parking/configs/extensions.conf")
         self.asterisk1.install_config("tests/one-step-parking/configs/iax.conf")
+        self.asterisk1.install_config("tests/one-step-parking/configs/logger.conf")
         self.asterisk1.install_config("tests/one-step-parking/configs/features.conf")
-        self.asterisk1.install_config("tests/one-step-parking/configs/logger.conf")
 
-        self.asterisk2 = Asterisk(base=os.path.join(os.getcwd(), "/tmp/asterisk-testsuite/one-step-parking/asterisk2"))
+        self.asterisk2 = Asterisk(base="/tmp/asterisk-testsuite/one-step-parking")
         self.asterisk2.install_config("tests/one-step-parking/configs2/extensions.conf")
         self.asterisk2.install_config("tests/one-step-parking/configs2/iax.conf")
         self.asterisk2.install_config("tests/one-step-parking/configs2/logger.conf")
@@ -56,10 +56,7 @@
     # This gets invoked by the dialplan when userA gets parked (701) and userB is trying to retrieve userA by dialing 701
     def get_result_dial_a(self, agi):
         self.log_last_step("Dial userA (701)")
-        if self.ast_version < AsteriskVersion("1.6.2"):
-            self.asterisk2.cli_exec("originate IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
-        else:
-            self.asterisk2.cli_exec("channel originate IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
+        self.asterisk2.cli_originate("IAX2/userA at 127.0.0.1:4570/701 extension retrieve_A at parking")
         return self.finish_agi(agi)
 
    # This gets invoked by the dialplan when test succeeds.
@@ -105,10 +102,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")
@@ -139,7 +133,6 @@
     # Run one-step-parking Test
     one_step_parking_test = OneStepParkingTest(argv)
     reactor.run()
-    one_step_parking_test.stop_asterisk()
     if one_step_parking_test.passed != True:
         return 1
     return 0




More information about the asterisk-commits mailing list