[asterisk-commits] mjordan: testsuite/asterisk/trunk r5862 - in /asterisk/trunk/tests/rest_api/a...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Nov  1 20:03:00 2014
New Revision: 5862

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5862
Log:
rest_api/applications/subscribe-endpoint/nominal: Fix stability issues

Fix more issues caused by the WebSocket being closed when the reactor is
stopped. This patch modifies the test to use the stop_test action triggered
by the last expected event.

Modified:
    asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/resource/test-config.yaml
    asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/tech/test-config.yaml

Modified: asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/resource/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/resource/test-config.yaml?view=diff&rev=5862&r1=5861&r2=5862
==============================================================================
--- asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/resource/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/resource/test-config.yaml Sat Nov  1 20:03:00 2014
@@ -30,10 +30,13 @@
         -
             config-section: ari-config
             typename: ari.WebSocketEventModule
-
+        -
+            config-section: ari-test-stopper
+            typename: pluggable_modules.EventActionModule
 
 test-object-config:
     asterisk-instances: 2
+    stop-on-end: False
     test-iterations:
         -
             channel: 'Local/dial_alice at default'
@@ -110,16 +113,19 @@
                         name: 'PJSIP/bob-00000000'
                         state: Up
             count: 1
-        -   conditions:
-                match:
-                    type: EndpointStateChange
-                    application: testsuite
-                    endpoint:
-                        technology: PJSIP
-                        resource: bob
-                        state: online
-                        channel_ids: []
-            count: 1
+
+ari-test-stopper:
+    -
+        ari-events:
+            match:
+                type: EndpointStateChange
+                application: testsuite
+                endpoint:
+                    technology: PJSIP
+                    resource: bob
+                    state: online
+                    channel_ids: []
+        stop_test:
 
 
 properties:

Modified: asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/tech/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/tech/test-config.yaml?view=diff&rev=5862&r1=5861&r2=5862
==============================================================================
--- asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/tech/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/applications/subscribe-endpoint/nominal/tech/test-config.yaml Sat Nov  1 20:03:00 2014
@@ -30,10 +30,13 @@
         -
             config-section: ari-config
             typename: ari.WebSocketEventModule
-
+        -
+            config-section: ari-test-stopper
+            typename: pluggable_modules.EventActionModule
 
 test-object-config:
     asterisk-instances: 2
+    stop-on-end: False
     test-iterations:
         -
             channel: 'Local/dial_alice at default'
@@ -120,17 +123,19 @@
                         name: 'IAX2/alice-.*'
                         state: Up
             count: 1
-        -   conditions:
-                match:
-                    type: EndpointStateChange
-                    application: testsuite
-                    endpoint:
-                        technology: IAX2
-                        resource: alice
-                        state: unknown
-                        channel_ids: []
-            count: 1
 
+ari-test-stopper:
+    -
+        ari-events:
+            match:
+                type: EndpointStateChange
+                application: testsuite
+                endpoint:
+                    technology: IAX2
+                    resource: alice
+                    state: unknown
+                    channel_ids: []
+        stop_test:
 
 properties:
     minversion: '12.5.0'