[svn-commits] mjordan: testsuite/asterisk/trunk r5195 - in /asterisk/trunk/tests/channels/p...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Jun 27 08:51:39 CDT 2014


Author: mjordan
Date: Fri Jun 27 08:51:35 2014
New Revision: 5195

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5195
Log:
pjsip/ami: Update tests to verify ActionID in event responses

This patch adds an ActionID to the actions sent by the various tests, and
verifies that the ActionID is returned in the events that are raised as
a result of that action.

ASTERISK-23947

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

Modified:
    asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/AMISendTest.py
    asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
    asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/AMISendTest.py
    asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/test-config.yaml
    asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/AMISendTest.py
    asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
    asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/AMISendTest.py
    asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/test-config.yaml
    asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/AMISendTest.py
    asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/test-config.yaml

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/AMISendTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/AMISendTest.py?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/AMISendTest.py (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/AMISendTest.py Fri Jun 27 08:51:35 2014
@@ -14,8 +14,9 @@
 from test_case import TestCase
 
 ACTION = {
-    "Action":"PJSIPShowEndpoint",
-    "Endpoint":"user1"
+    "Action": "PJSIPShowEndpoint",
+    "ActionID": "12345",
+    "Endpoint": "user1"
 }
 
 class AMISendTest(TestCase):

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_endpoint/test-config.yaml Fri Jun 27 08:51:35 2014
@@ -37,6 +37,7 @@
                     Event: 'EndpointDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'endpoint'
                     ObjectName: 'user1'
                     SrtpTag32: 'false'
@@ -125,6 +126,7 @@
                     Event: 'AorDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: aor
                     ObjectName: user1
                     Mailboxes: ''
@@ -147,6 +149,7 @@
                     Event: 'AuthDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'auth'
                     ObjectName: 'user1'
                     AuthType: 'userpass'
@@ -164,6 +167,7 @@
                     Event: 'TransportDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'transport'
                     ObjectName: 'local'
                     Cos: '0'
@@ -194,6 +198,7 @@
                     Event: 'IdentifyDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'identify'
                     ObjectName: 'user1'
                     Endpoint: 'user1'
@@ -206,6 +211,7 @@
                     Event: 'EndpointDetailComplete'
             requirements:
                 match:
+                    ActionID: '12345'
                     EventList: 'Complete'
                     ListItems: '5'
             count: 1

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/AMISendTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/AMISendTest.py?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/AMISendTest.py (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/AMISendTest.py Fri Jun 27 08:51:35 2014
@@ -14,7 +14,8 @@
 from test_case import TestCase
 
 ACTION = {
-    "Action":"PJSIPShowEndpoints"
+    "Action":"PJSIPShowEndpoints",
+    "ActionID": "12345",
 }
 
 class AMISendTest(TestCase):

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/test-config.yaml?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_endpoints/test-config.yaml Fri Jun 27 08:51:35 2014
@@ -37,6 +37,7 @@
                     Event: 'EndpointList'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'endpoint'
                     ObjectName: 'user.*'
                     Transport: 'local'
@@ -54,6 +55,7 @@
                     Event: 'EndpointListComplete'
             requirements:
                 match:
+                    ActionID: '12345'
                     EventList: 'Complete'
                     ListItems: '2'
             count: 1

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/AMISendTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/AMISendTest.py?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/AMISendTest.py (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/AMISendTest.py Fri Jun 27 08:51:35 2014
@@ -18,7 +18,8 @@
 LOGGER = logging.getLogger(__name__)
 
 ACTION = {
-    "Action":"PJSIPShowRegistrationsInbound"
+    "Action": "PJSIPShowRegistrationsInbound",
+    "ActionID": "12345",
 }
 
 class AMISendTest(TestCase):

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_registrations_inbound/test-config.yaml Fri Jun 27 08:51:35 2014
@@ -37,6 +37,7 @@
                     Event: 'InboundRegistrationDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'aor'
                     ObjectName: 'user.*'
                     Mailboxes: ''
@@ -56,6 +57,7 @@
                     Event: 'InboundRegistrationDetailComplete'
             requirements:
                 match:
+                    ActionID: '12345'
                     EventList: 'Complete'
                     ListItems: '2'
             count: 1

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/AMISendTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/AMISendTest.py?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/AMISendTest.py (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/AMISendTest.py Fri Jun 27 08:51:35 2014
@@ -14,7 +14,8 @@
 from test_case import TestCase
 
 ACTION = {
-    "Action":"PJSIPShowRegistrationsOutbound"
+    "Action": "PJSIPShowRegistrationsOutbound",
+    "ActionID": "12345",
 }
 
 class AMISendTest(TestCase):

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/test-config.yaml?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_registrations_outbound/test-config.yaml Fri Jun 27 08:51:35 2014
@@ -37,6 +37,7 @@
                     Event: 'OutboundRegistrationDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'registration'
                     ObjectName: 'user.*'
                     OutboundAuth: 'reg-auth'
@@ -60,6 +61,7 @@
                     Event: 'AuthDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     ObjectType: 'auth'
                     ObjectName: 'reg-auth'
                     AuthType: 'userpass'
@@ -77,6 +79,7 @@
                     Event: 'OutboundRegistrationDetailComplete'
             requirements:
                 match:
+                    ActionID: '12345'
                     EventList: 'Complete'
                     Registered: '0'
                     NotRegistered: '5'

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/AMISendTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/AMISendTest.py?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/AMISendTest.py (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/AMISendTest.py Fri Jun 27 08:51:35 2014
@@ -20,7 +20,8 @@
 LOGGER = logging.getLogger(__name__)
 
 ACTION = {
-    "Action":"PJSIPShowSubscriptionsInbound"
+    "Action": "PJSIPShowSubscriptionsInbound",
+    "ActionID": "12345",
 }
 
 class AMISendTest(TestCase):

Modified: asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/test-config.yaml?view=diff&rev=5195&r1=5194&r2=5195
==============================================================================
--- asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/test-config.yaml (original)
+++ asterisk/trunk/tests/channels/pjsip/ami/show_subscriptions/test-config.yaml Fri Jun 27 08:51:35 2014
@@ -41,6 +41,7 @@
                     Event: 'InboundSubscriptionDetail'
             requirements:
                 match:
+                    ActionID: '12345'
                     Role: Notifier
                     Endpoint: 'user.*'
                     Callid: '.*'
@@ -55,6 +56,7 @@
                     Event: 'InboundSubscriptionDetailComplete'
             requirements:
                 match:
+                    ActionID: '12345'
                     EventList: 'Complete'
                     ListItems: '2'
             count: 1




More information about the svn-commits mailing list