[svn-commits] jbigelow: testsuite/asterisk/trunk r4026 - in /asterisk/trunk/tests/bridge: a...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Aug 16 17:52:41 CDT 2013


Author: jbigelow
Date: Fri Aug 16 17:52:38 2013
New Revision: 4026

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4026
Log:
Allow many of the bridging tests to properly run against Asterisk 11

This changes several of the bridging tests that were originally developed for
Asterisk 12 so that they are able to run against Asterisk 11.

Additionally the TEST_FRAMEWORK dependency was added to tests that use the
feature configuration of BridgeTestCase as it depends on the test events.

Review: https://reviewboard.asterisk.org/r/2750/


Modified:
    asterisk/trunk/tests/bridge/atxfer_nominal/test-config.yaml
    asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml
    asterisk/trunk/tests/bridge/automixmon/test-config.yaml
    asterisk/trunk/tests/bridge/automon/test-config.yaml
    asterisk/trunk/tests/bridge/blindxfer_nominal/test-config.yaml
    asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml
    asterisk/trunk/tests/bridge/blonde_nominal/test-config.yaml
    asterisk/trunk/tests/bridge/disconnect/test-config.yaml
    asterisk/trunk/tests/bridge/parkcall/test-config.yaml
    asterisk/trunk/tests/bridge/parkcall_blindxfer/test-config.yaml
    asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
    asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
    asterisk/trunk/tests/bridge/simple_bridge/test-config.yaml
    asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml
    asterisk/trunk/tests/bridge/transfer_failure/test-config.yaml

Modified: asterisk/trunk/tests/bridge/atxfer_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/atxfer_nominal/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/atxfer_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/atxfer_nominal/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -59,8 +59,9 @@
                   exten: '123'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/atxfer_setup/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -415,8 +415,9 @@
                 channel: '.*/alice-.*'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/automixmon/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automixmon/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/automixmon/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/automixmon/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -589,6 +589,7 @@
 properties:
     minversion: '12.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/automon/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/automon/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/automon/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/automon/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -591,6 +591,7 @@
 properties:
     minversion: '12.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/blindxfer_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/blindxfer_nominal/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/blindxfer_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/blindxfer_nominal/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -59,8 +59,9 @@
                   exten: '123'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/blindxfer_setup/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -415,8 +415,9 @@
                 channel: '.*/alice-.*'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/blonde_nominal/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/blonde_nominal/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/blonde_nominal/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/blonde_nominal/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -46,8 +46,9 @@
                   exten: '123'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/disconnect/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/disconnect/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/disconnect/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/disconnect/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -413,8 +413,9 @@
 
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/parkcall/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/parkcall/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/parkcall/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/parkcall/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -119,6 +119,7 @@
 properties:
     minversion: '12.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/parkcall_blindxfer/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/parkcall_blindxfer/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/parkcall_blindxfer/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/parkcall_blindxfer/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -190,7 +190,7 @@
         count: '1'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'

Modified: asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_no/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -80,8 +80,9 @@
                 amaflags: 'DOCUMENTATION'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/parkcall_timeout/comebacktoorigin_yes/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -109,8 +109,9 @@
                 amaflags: 'DOCUMENTATION'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/simple_bridge/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/simple_bridge/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/simple_bridge/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/simple_bridge/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -17,7 +17,12 @@
             typename: 'cel.CELModule'
         -
             typename: 'ami.AMIEventModule'
-            config-section: ami-uut
+            config-section: 'ami-uut-v12'
+            minversion: '12.0.0'
+        -
+            typename: 'ami.AMIEventModule'
+            config-section: 'ami-uut-v11'
+            maxversion: '12.0.0'
 
 bridge-config:
   test-runs:
@@ -28,7 +33,7 @@
         originate_channel: 'SIP/test_call at uut'
         hangup: 'bob'
 
-ami-uut:
+ami-uut-v12:
     -
         type: 'headermatch'
         id: '0'
@@ -137,6 +142,66 @@
                 BridgeType: 'simple_bridge'
         count: '2'
 
+ami-uut-v11:
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'Newstate'
+                Channel: 'SIP/bob-.*'
+                ChannelStateDesc: 'Up'
+        requirements:
+            match:
+                CallerIDNum: '4321'
+                CallerIDName: 'Bob'
+                ConnectedLineNum: '1234'
+                ConnectedLineName: 'Alice'
+        count: '2'
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'Newstate'
+                Channel: 'SIP/alice-.*'
+                ChannelStateDesc: 'Up'
+        requirements:
+            match:
+                CallerIDNum: '1234'
+                CallerIDName: 'Alice'
+                ConnectedLineNum: '4321'
+                ConnectedLineName: 'Bob'
+        count: '2'
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'Bridge'
+                Bridgestate: 'Link'
+        requirements:
+            match:
+                Channel1: 'SIP/alice-.*'
+                Channel2: 'SIP/bob-.*'
+                CallerID1: '1234'
+                CallerID2: '4321'
+        count: '10'
+    -
+        type: 'headermatch'
+        id: '0'
+        conditions:
+            match:
+                Event: 'Bridge'
+                Bridgestate: 'Unlink'
+        requirements:
+            match:
+                Channel1: 'SIP/alice-.*'
+                Channel2: 'SIP/bob-.*'
+                CallerID1: '1234'
+                CallerID2: '4321'
+        count: '10'
+
 cdr-config:
     -
         file: 'Master'
@@ -380,7 +445,7 @@
                 channel: '.*/alice-.*'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
         - python : 'twisted'
         - python : 'starpy'

Modified: asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/transfer_capabilities/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -8,6 +8,7 @@
 properties:
     minversion: '12.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:

Modified: asterisk/trunk/tests/bridge/transfer_failure/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/bridge/transfer_failure/test-config.yaml?view=diff&rev=4026&r1=4025&r2=4026
==============================================================================
--- asterisk/trunk/tests/bridge/transfer_failure/test-config.yaml (original)
+++ asterisk/trunk/tests/bridge/transfer_failure/test-config.yaml Fri Aug 16 17:52:38 2013
@@ -5,8 +5,9 @@
         that transfer attempts with invalid extensions do not succeed.'
 
 properties:
-    minversion: '12.0.0'
+    minversion: '11.0.0'
     dependencies:
+        - buildoption: 'TEST_FRAMEWORK'
         - python : 'twisted'
         - python : 'starpy'
     tags:




More information about the svn-commits mailing list