[svn-commits] pabelanger: branch pabelanger/SWP-2715 r1277 - in /asterisk/team/pabelanger/S...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Dec 22 19:15:18 UTC 2010
Author: pabelanger
Date: Wed Dec 22 13:15:13 2010
New Revision: 1277
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1277
Log:
Merged revisions 1264-1265,1271 via svnmerge from
https://origsvn.digium.com/svn/testsuite/asterisk/trunk
........
r1264 | pabelanger | 2010-12-20 21:00:05 -0500 (Mon, 20 Dec 2010) | 4 lines
Rewrite feature_blonde_transfer test
Review: https://reviewboard.asterisk.org/r/1058/
........
r1265 | pabelanger | 2010-12-20 21:05:12 -0500 (Mon, 20 Dec 2010) | 2 lines
Fix typo in dialplan
........
r1271 | pabelanger | 2010-12-22 12:16:37 -0500 (Wed, 22 Dec 2010) | 2 lines
Use default ports
........
Modified:
asterisk/team/pabelanger/SWP-2715/ (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/ (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter2.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter3.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/donothing.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/executing.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/waiting.agi (props changed)
asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast1/iax.conf
asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/extensions.conf
asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/iax.conf
asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/run-test
Propchange: asterisk/team/pabelanger/SWP-2715/
------------------------------------------------------------------------------
svn:mergeinfo = /asterisk/trunk:1264-1271
Propchange: asterisk/team/pabelanger/SWP-2715/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 22 13:15:13 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-1259
+/asterisk/trunk:1-1259,1264-1271
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter.agi
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter2.agi
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/badinterpreter3.agi
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/donothing.agi
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/executing.agi
('svn:mergeinfo' removed)
Propchange: asterisk/team/pabelanger/SWP-2715/tests/agi/exit_status/userA/agi-bin/waiting.agi
('svn:mergeinfo' removed)
Modified: asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast1/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast1/iax.conf?view=diff&rev=1277&r1=1276&r2=1277
==============================================================================
--- asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast1/iax.conf (original)
+++ asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast1/iax.conf Wed Dec 22 13:15:13 2010
@@ -1,5 +1,4 @@
[general]
-bindport=4570
bindaddr=127.0.0.1
transfer=yes
@@ -11,7 +10,6 @@
[iax_a]
type=user
host=127.0.0.2
-port=4570
secret=pa$$word
context=alpha
deny=0.0.0.0/0.0.0.0
@@ -20,7 +18,6 @@
[iax_c]
type=user
host=127.0.0.2
-port=4570
secret=p at ssw0rd
context=charlie
deny=0.0.0.0/0.0.0.0
Modified: asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/extensions.conf?view=diff&rev=1277&r1=1276&r2=1277
==============================================================================
--- asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/extensions.conf (original)
+++ asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/extensions.conf Wed Dec 22 13:15:13 2010
@@ -12,7 +12,7 @@
exten => 1000,1,Answer()
exten => 1000,n,Background(demo-congrats)
-exten => 1000,n,UserEvent(bravo, status: SUCCESS)
+exten => 1000,n,UserEvent(bravo, status: FAILURE)
exten => 1000,n,Hangup()
exten => 1050,1,SendDTMF(*w2)
Modified: asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/iax.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/iax.conf?view=diff&rev=1277&r1=1276&r2=1277
==============================================================================
--- asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/iax.conf (original)
+++ asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/configs/ast2/iax.conf Wed Dec 22 13:15:13 2010
@@ -1,5 +1,4 @@
[general]
-bindport=4570
bindaddr=127.0.0.2
transfer=yes
disallow=all
@@ -10,7 +9,6 @@
[iax_a]
type=peer
host=127.0.0.1
-port=4570
username=iax_a
secret=pa$$word
context=alpha
@@ -18,7 +16,6 @@
[iax_c]
type=peer
host=127.0.0.1
-port=4570
username=iax_c
secret=p at ssw0rd
context=charlie
Modified: asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/run-test?view=diff&rev=1277&r1=1276&r2=1277
==============================================================================
--- asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/run-test (original)
+++ asterisk/team/pabelanger/SWP-2715/tests/feature_blonde_transfer/run-test Wed Dec 22 13:15:13 2010
@@ -59,13 +59,6 @@
if reactor.running:
reactor.stop()
- # This is an attended transfer test. There are 3 call legs tested here, A, B, and C.
- # 1. B calls A
- # 2. B dials *2 to transfer A to C.
- # 3. B dials C's extension
- # 4. B hangs up before C picks up which connects A to C.
- # 5. Audio and DTMF is passed and detected on each side of the call verifying the connection.
- # 6. A and C report results to FastAGI and hangup.
def launch_test(self):
self.ast2.cli_originate("Local/1000 at transfertest extension a_dial at transfertest")
More information about the svn-commits
mailing list