[asterisk-commits] rmudgett: branch rmudgett/cel_accountcode r5305 - in /asterisk/team/rmudgett/...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Jul 22 20:02:32 CDT 2014


Author: rmudgett
Date: Tue Jul 22 20:02:25 2014
New Revision: 5305

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5305
Log:
testsuite: Eliminate the Wait in cel_accountcode tests.

Modified:
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf
    asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -6,5 +6,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_none/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -15,6 +15,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -54,10 +57,20 @@
                 PeerAccount: ''
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'res_pjsip'
     tags:
         - pjsip

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -8,5 +8,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_none/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,10 +58,20 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -8,5 +8,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_peer_override/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,10 +58,20 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -12,5 +12,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_predial/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,10 +58,20 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -7,5 +7,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_none/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,10 +58,20 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -7,5 +7,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/dial_straight_override/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,10 +58,20 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -8,5 +8,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -11,6 +11,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -103,10 +106,20 @@
                 PeerAccount: 'alice_peer'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|Local/bob at default-.*'
+            Channel: 'Local/alice at default-.*|Local/bob at default-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
     tags:
         - accountcode

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -15,5 +15,4 @@
  same => n,Set(CHANNEL(accountcode)=bob_acct)
  same => n,Set(CHANNEL(peeraccount)=bob_peer)
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_crossover_back/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -12,6 +12,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -104,10 +107,20 @@
                 PeerAccount: 'bob_peer'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|Local/bob at default-.*'
+            Channel: 'Local/alice at default-.*|Local/bob at default-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
         - asterisk : 'app_dial'
+        - asterisk : 'app_echo'
         - asterisk : 'func_channel'
     tags:
         - accountcode

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/local_originate/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -52,5 +52,7 @@
 
 properties:
     minversion: '13.0.0'
+    dependencies:
+        - asterisk : 'app_echo'
     tags:
         - accountcode

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -6,5 +6,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_none/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -15,6 +15,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -54,9 +57,19 @@
                 PeerAccount: ''
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
+        - asterisk : 'app_echo'
         - asterisk : 'app_queue'
         - asterisk : 'res_pjsip'
     tags:

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -8,5 +8,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_none/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -16,6 +16,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -55,9 +58,19 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
+        - asterisk : 'app_echo'
         - asterisk : 'app_queue'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/configs/ast1/extensions.conf Tue Jul 22 20:02:25 2014
@@ -8,5 +8,4 @@
 
 exten => bob,1,NoOp()
  same => n,Answer()
- same => n,Wait(5)
- same => n,Hangup()
+ same => n,Echo()

Modified: asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml?view=diff&rev=5305&r1=5304&r2=5305
==============================================================================
--- asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml (original)
+++ asterisk/team/rmudgett/cel_accountcode/tests/pbx/accountcode/queue_peer_preserve/test-config.yaml Tue Jul 22 20:02:25 2014
@@ -15,6 +15,9 @@
         -
             config-section: ami-config
             typename: 'ami.AMIEventModule'
+        -
+            config-section: hangup-config
+            typename: 'pluggable_modules.AMIChannelHangup'
 
 test-object-config:
     spawn-after-hangup: True
@@ -54,9 +57,19 @@
                 PeerAccount: 'alice_dialplan'
         count: '1'
 
+hangup-config:
+    type: 'headermatch'
+    conditions:
+        match:
+            Event: 'CEL'
+            EventName: 'BRIDGE_ENTER'
+            Peer: 'Local/alice at default-.*|PJSIP/bob-.*'
+            Channel: 'Local/alice at default-.*|PJSIP/bob-.*'
+
 properties:
     minversion: '13.0.0'
     dependencies:
+        - asterisk : 'app_echo'
         - asterisk : 'app_queue'
         - asterisk : 'func_channel'
         - asterisk : 'res_pjsip'




More information about the asterisk-commits mailing list