[asterisk-commits] mjordan: testsuite/asterisk/trunk r3787 - in /asterisk/trunk/tests/apps/dial:...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sun May 19 15:56:33 CDT 2013


Author: mjordan
Date: Sun May 19 15:56:29 2013
New Revision: 3787

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3787
Log:
Fix dial tests in the presence of origination events

Originated channels also have Dial related events. These tests were not
completely checking for which channel was dialed in their AMI event matching,
and hence were failing due to triggering on the Origination based dial events.

Modified:
    asterisk/trunk/tests/apps/dial/dial_busy/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_congestion/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_hangup/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_timeout/test-config.yaml
    asterisk/trunk/tests/apps/dial/dial_unavail/test-config.yaml

Modified: asterisk/trunk/tests/apps/dial/dial_busy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_busy/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_busy/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_busy/test-config.yaml Sun May 19 15:56:29 2013
@@ -42,11 +42,11 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'
@@ -59,11 +59,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'

Modified: asterisk/trunk/tests/apps/dial/dial_congestion/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_congestion/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_congestion/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_congestion/test-config.yaml Sun May 19 15:56:29 2013
@@ -42,11 +42,11 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'
@@ -59,11 +59,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'

Modified: asterisk/trunk/tests/apps/dial/dial_hangup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_hangup/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_hangup/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_hangup/test-config.yaml Sun May 19 15:56:29 2013
@@ -45,6 +45,7 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                ChannelDest: 'SIP/charlie-.*'
         callbackModule: 'hangup'
         callbackMethod: 'send_hangup'
     -
@@ -52,11 +53,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/charlie-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/charlie-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'

Modified: asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_no_answer/test-config.yaml Sun May 19 15:56:29 2013
@@ -42,11 +42,11 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'
@@ -59,11 +59,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'

Modified: asterisk/trunk/tests/apps/dial/dial_timeout/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_timeout/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_timeout/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_timeout/test-config.yaml Sun May 19 15:56:29 2013
@@ -44,11 +44,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'

Modified: asterisk/trunk/tests/apps/dial/dial_unavail/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/dial/dial_unavail/test-config.yaml?view=diff&rev=3787&r1=3786&r2=3787
==============================================================================
--- asterisk/trunk/tests/apps/dial/dial_unavail/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/dial/dial_unavail/test-config.yaml Sun May 19 15:56:29 2013
@@ -42,11 +42,11 @@
         conditions:
             match:
                 Event: 'DialBegin'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'
@@ -59,11 +59,11 @@
         conditions:
             match:
                 Event: 'DialEnd'
+                ChannelDest: 'SIP/bob-.*'
         requirements:
             match:
                 Channel: 'Local/s at default-.*'
                 Uniqueid: '.*'
-                ChannelDest: 'SIP/bob-.*'
                 UniqueidDest: '.*'
                 CallerIDNum: '<unknown>'
                 CallerIDName: '<unknown>'




More information about the asterisk-commits mailing list