[asterisk-commits] dlee: branch dlee/ari-bridge-tests r4148 - in /asterisk/team/dlee/ari-bridge-...

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Sep 10 13:41:51 2013
New Revision: 4148

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4148
Log:
Merged revisions 4145-4147 from http://svn.asterisk.org/svn/testsuite/asterisk/team/dlee/matts-ari-patch

Rebasing to trunk

Modified:
    asterisk/team/dlee/ari-bridge-tests/   (props changed)
    asterisk/team/dlee/ari-bridge-tests/tests/apps/bridge/bridge_baseline/test-config.yaml

Propchange: asterisk/team/dlee/ari-bridge-tests/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 10 13:41:51 2013
@@ -1,1 +1,1 @@
-/asterisk/team/dlee/matts-ari-patch:1-4063
+/asterisk/trunk:1-4065

Modified: asterisk/team/dlee/ari-bridge-tests/tests/apps/bridge/bridge_baseline/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/dlee/ari-bridge-tests/tests/apps/bridge/bridge_baseline/test-config.yaml?view=diff&rev=4148&r1=4147&r2=4148
==============================================================================
--- asterisk/team/dlee/ari-bridge-tests/tests/apps/bridge/bridge_baseline/test-config.yaml (original)
+++ asterisk/team/dlee/ari-bridge-tests/tests/apps/bridge/bridge_baseline/test-config.yaml Tue Sep 10 13:41:51 2013
@@ -12,8 +12,14 @@
             config-section: originator-config
             typename: 'PluggableModules.Originator'
         -
+            minversion: '1.8.0.0'
+            maxversion: '10.0.0'
+            config-section: ami-config-1.8
+            typename: 'ami.AMIEventModule'
+        -
+            minversion: '11.0.0'
             maxversion: '12.0.0'
-            config-section: ami-config-pre-12
+            config-section: ami-config-11
             typename: 'ami.AMIEventModule'
         -
             maxversion: '12.0.0'
@@ -68,7 +74,23 @@
             Bridgestate: 'Link'
             Bridgetype: 'core'
 
-ami-config-pre-12:
+ami-config-1.8:
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'Bridge'
+                Bridgestate: 'Link'
+                Bridgetype: 'core'
+        count: '1'
+    -
+        type: 'headermatch'
+        conditions:
+            match:
+                Event: 'Unlink'
+        count: '1'
+
+ami-config-11:
     -
         type: 'headermatch'
         conditions: