[asterisk-commits] mjordan: testsuite/asterisk/trunk r4033 - in /asterisk/trunk/tests/channels/l...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Aug 18 16:57:50 2013
New Revision: 4033

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4033
Log:
Fix Holding Bridge test after optimization changes were made to BridgeWait

Prior to channel roles being added to the BridgeWait application, a Local
channel could optimize into a holding bridge. However, the act of optimization
makes persisting channel roles difficult, so the bridge was set up to inhibit
merges and swaps (thus preventing optimizations).

This now updatese the tests accordingly. It also properly calls BridgeWait with
the correct parameters given the new entertainment/role/name options.

Modified:
    asterisk/trunk/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
    asterisk/trunk/tests/channels/local/local_holding_bridge/test-config.yaml

Modified: asterisk/trunk/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf?view=diff&rev=4033&r1=4032&r2=4033
==============================================================================
--- asterisk/trunk/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf (original)
+++ asterisk/trunk/tests/channels/local/local_holding_bridge/configs/ast1/extensions.conf Sun Aug 18 16:57:50 2013
@@ -3,7 +3,7 @@
 
 exten => holdem,1,NoOp()
 	same => n,Answer()
-	same => n,BridgeWait(S(2))
+	same => n,BridgeWait(,,e(n)S(2))
 	same => n,Hangup()
 
 exten => dial_foo,1,NoOp()

Modified: asterisk/trunk/tests/channels/local/local_holding_bridge/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/local/local_holding_bridge/test-config.yaml?view=diff&rev=4033&r1=4032&r2=4033
==============================================================================
--- asterisk/trunk/tests/channels/local/local_holding_bridge/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/local/local_holding_bridge/test-config.yaml Sun Aug 18 16:57:50 2013
@@ -5,10 +5,10 @@
         Bridge:
         SIP/foo <---> Local/1 <-> Local/2 <---
                  B0           LB           HB
-        In the first iteration, the Local channel should optimize itself away,
-        resulting in SIP/foo being put directly into the Holding Bridge (HB).
-        In the second iteration, the n flag should keep the Local channel from
-        optimizing, resulting in the original bridge(s) being maintained.
+        In both iterations, regardless of the presence of the n flag, the Local
+        channel should not optimize away. Using the BridgeWait application
+        requires Local channels to not optimize, as it has the concept of
+        channel roles (which Local optimization typically destroys)
 
 properties:
     minversion: '12.0.0'
@@ -61,7 +61,7 @@
                 Event: 'LocalOptimizationBegin'
                 LocalOneChannel: 'Local/holdem at default-.{7}0;1'
                 LocalTwoChannel: 'Local/holdem at default-.{7}0;2'
-        count: '1'
+        count: '0'
     -
         type: 'headermatch'
         conditions:
@@ -69,7 +69,7 @@
                 Event: 'LocalOptimizationEnd'
                 LocalOneChannel: 'Local/holdem at default-.{7}0;1'
                 LocalTwoChannel: 'Local/holdem at default-.{7}0;2'
-        count: '1'
+        count: '0'
     -
         type: 'headermatch'
         conditions: