[asterisk-commits] mjordan: testsuite/asterisk/trunk r5864 - in /asterisk/trunk/tests/rest_api/c...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Nov  1 20:23:34 2014
New Revision: 5864

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5864
Log:
rest_api/channels/{originate|playback|snoop_id}: Fix stability issues

This *may* be the last of the tests impacted by the WebSocket closure patch.
I hope.

Modified:
    asterisk/trunk/tests/rest_api/channels/originate/test-config.yaml
    asterisk/trunk/tests/rest_api/channels/playback/tones/test-config.yaml
    asterisk/trunk/tests/rest_api/channels/snoop_id/test-config.yaml

Modified: asterisk/trunk/tests/rest_api/channels/originate/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/channels/originate/test-config.yaml?view=diff&rev=5864&r1=5863&r2=5864
==============================================================================
--- asterisk/trunk/tests/rest_api/channels/originate/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/channels/originate/test-config.yaml Sat Nov  1 20:23:34 2014
@@ -7,9 +7,14 @@
     add-test-to-search-path: True
     test-object:
         typename: ari.AriTestObject
+        config-section: test-config
     modules:
-        -   config-section: ari-config
+        -
+            config-section: ari-config
             typename: ari.WebSocketEventModule
+
+test-config:
+    stop-on-end: False
 
 ari-config:
     apps: testsuite

Modified: asterisk/trunk/tests/rest_api/channels/playback/tones/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/channels/playback/tones/test-config.yaml?view=diff&rev=5864&r1=5863&r2=5864
==============================================================================
--- asterisk/trunk/tests/rest_api/channels/playback/tones/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/channels/playback/tones/test-config.yaml Sat Nov  1 20:23:34 2014
@@ -30,6 +30,22 @@
     modules:
         -   config-section: ari-config
             typename: ari.WebSocketEventModule
+        -
+            config-section: ari-test-stopper
+            typename: pluggable_modules.EventActionModule
+
+test-object-config:
+    stop-on-end: False
+
+ari-test-stopper:
+    -
+        ari-events:
+            match:
+                type: ChannelDestroyed
+                application: testsuite
+                channel:
+                    id: 'testsuite-default-id$'
+        stop_test:
 
 ari-config:
     apps: testsuite
@@ -114,12 +130,3 @@
                     channel:
                         id: 'testsuite-default-id$'
             count: 1
-        -
-            conditions:
-                match:
-                    type: ChannelDestroyed
-                    application: testsuite
-                    channel:
-                        id: 'testsuite-default-id$'
-            count: 1
-

Modified: asterisk/trunk/tests/rest_api/channels/snoop_id/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/channels/snoop_id/test-config.yaml?view=diff&rev=5864&r1=5863&r2=5864
==============================================================================
--- asterisk/trunk/tests/rest_api/channels/snoop_id/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/channels/snoop_id/test-config.yaml Sat Nov  1 20:23:34 2014
@@ -25,14 +25,29 @@
         config-section: test-object-config
         typename: ari.AriOriginateTestObject
     modules:
-        -   config-section: ari-config
+        -
+            config-section: ari-config
             typename: ari.WebSocketEventModule
+        -
+            config-section: ari-test-stopper
+            typename: pluggable_modules.EventActionModule
 
 test-object-config:
     # using default origination:
     #   endpoint: Local/s at default
     #   channelId: testsuite-default-id
     #   app: testsuite
+    stop-on-end: False
+
+ari-test-stopper:
+    -
+        ari-events:
+            match:
+                type: ChannelDestroyed
+                application: testsuite
+                channel:
+                    id: 'testsuite-default-id$'
+        stop_test:
 
 ari-config:
     apps: testsuite
@@ -103,12 +118,4 @@
                     channel:
                         id: 'testsuite-default-id$'
             count: 1
-        -
-            conditions:
-                match:
-                    type: ChannelDestroyed
-                    application: testsuite
-                    channel:
-                        id: 'testsuite-default-id$'
-            count: 1