[asterisk-commits] mjordan: testsuite/asterisk/trunk r5861 - in /asterisk/trunk/tests/rest_api/m...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Nov  1 19:34:25 2014
New Revision: 5861

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5861
Log:
rest_api/message/{endpoint|technology}/recv: Fix more WebSocket woes

More tests that fail with the WebSocket closed on stop_reactor. Again, we use
an event/action pair to prevent that with the stop_test action.

Modified:
    asterisk/trunk/tests/rest_api/message/endpoint/recv/test-config.yaml
    asterisk/trunk/tests/rest_api/message/technology/recv/test-config.yaml

Modified: asterisk/trunk/tests/rest_api/message/endpoint/recv/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/message/endpoint/recv/test-config.yaml?view=diff&rev=5861&r1=5860&r2=5861
==============================================================================
--- asterisk/trunk/tests/rest_api/message/endpoint/recv/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/message/endpoint/recv/test-config.yaml Sat Nov  1 19:34:25 2014
@@ -13,7 +13,7 @@
     modules:
         -
             config-section: ari-config
-            typename: ari.WebSocketEventModule
+            typename: pluggable_modules.EventActionModule
         -
             config-section: message-sender
             typename: 'message_modules.SIPMessageRunner'
@@ -30,25 +30,24 @@
         - { event-source: 'endpoint:PJSIP/alice', app: 'testsuite' }
 
 message-sender:
-    end-on-success: True
     sipp:
         - { 'scenario':'message.xml', '-p':'5061' }
 
 ari-config:
-    events:
-        -   conditions:
-                match:
-                    type: TextMessageReceived
-                    application: testsuite
-                    message:
-                        to: 'pjsip:asterisk at 127.0.0.1'
-                        from: '"alice" <sip:alice at 127.0.0.1>'
-                        body: 'Watson, come here.'
-                    endpoint:
-                        technology: PJSIP
-                        resource: alice
-                        state: online
-            count: 1
+    ari-events:
+        match:
+            type: TextMessageReceived
+            application: testsuite
+            message:
+                to: 'pjsip:asterisk at 127.0.0.1'
+                from: '"alice" <sip:alice at 127.0.0.1>'
+                body: 'Watson, come here.'
+            endpoint:
+                technology: PJSIP
+                resource: alice
+                state: online
+        count: 1
+    stop_test:
 
 properties:
     minversion: '12.5.0'

Modified: asterisk/trunk/tests/rest_api/message/technology/recv/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/message/technology/recv/test-config.yaml?view=diff&rev=5861&r1=5860&r2=5861
==============================================================================
--- asterisk/trunk/tests/rest_api/message/technology/recv/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/message/technology/recv/test-config.yaml Sat Nov  1 19:34:25 2014
@@ -13,7 +13,7 @@
     modules:
         -
             config-section: ari-config
-            typename: ari.WebSocketEventModule
+            typename: pluggable_modules.EventActionModule
         -
             config-section: message-sender
             typename: 'message_modules.SIPMessageRunner'
@@ -30,25 +30,24 @@
         - { event-source: 'endpoint:PJSIP', app: 'testsuite' }
 
 message-sender:
-    end-on-success: True
     sipp:
         - { 'scenario':'message.xml', '-p':'5061' }
 
 ari-config:
-    events:
-        -   conditions:
-                match:
-                    type: TextMessageReceived
-                    application: testsuite
-                    message:
-                        to: 'pjsip:asterisk at 127.0.0.1'
-                        from: '"alice" <sip:alice at 127.0.0.1>'
-                        body: 'Watson, come here.'
-                    endpoint:
-                        technology: PJSIP
-                        resource: alice
-                        state: online
-            count: 1
+    ari-events:
+        match:
+            type: TextMessageReceived
+            application: testsuite
+            message:
+                to: 'pjsip:asterisk at 127.0.0.1'
+                from: '"alice" <sip:alice at 127.0.0.1>'
+                body: 'Watson, come here.'
+            endpoint:
+                technology: PJSIP
+                resource: alice
+                state: online
+        count: 1
+    stop_test:
 
 properties:
     minversion: '12.5.0'