[asterisk-commits] mjordan: testsuite/asterisk/trunk r5863 - in /asterisk/trunk/tests/rest_api/b...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Nov  1 20:10:19 2014
New Revision: 5863

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5863
Log:
rest_api/bridges/{hangup|happy}: Fix test stability issues

This patch makes the tests stop when the last expected event is received, and
not when the test iteration completes in the underlying test object. This
prevents the WebSocket being closed by the call to stop_reactor from causing
events to be missed.

How many different ways can I type this commit message? :-)

Modified:
    asterisk/trunk/tests/rest_api/bridges/hangup/test-config.yaml
    asterisk/trunk/tests/rest_api/bridges/happy/test-config.yaml

Modified: asterisk/trunk/tests/rest_api/bridges/hangup/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/bridges/hangup/test-config.yaml?view=diff&rev=5863&r1=5862&r2=5863
==============================================================================
--- asterisk/trunk/tests/rest_api/bridges/hangup/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/bridges/hangup/test-config.yaml Sat Nov  1 20:10:19 2014
@@ -9,8 +9,23 @@
         config-section: test-object-config
         typename: ari.AriTestObject
     modules:
-        -   config-section: ari-config
+        -
+            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: StasisEnd
+                application: testsuite
+        stop_test:
 
 ari-config:
     apps: testsuite
@@ -37,11 +52,6 @@
                     type: ChannelLeftBridge
                     application: testsuite
             count: 1
-        -   conditions:
-                match:
-                    type: StasisEnd
-                    application: testsuite
-            count: 1
 
 properties:
     minversion: '12.0.0'

Modified: asterisk/trunk/tests/rest_api/bridges/happy/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/rest_api/bridges/happy/test-config.yaml?view=diff&rev=5863&r1=5862&r2=5863
==============================================================================
--- asterisk/trunk/tests/rest_api/bridges/happy/test-config.yaml (original)
+++ asterisk/trunk/tests/rest_api/bridges/happy/test-config.yaml Sat Nov  1 20:10:19 2014
@@ -10,8 +10,23 @@
         config-section: test-object-config
         typename: ari.AriTestObject
     modules:
-        -   config-section: ari-config
+        -
+            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: StasisEnd
+                application: testsuite
+        stop_test:
 
 ari-config:
     apps: testsuite
@@ -41,11 +56,6 @@
             callback:
                 module: bridge_happy
                 method: on_leave
-        -   conditions:
-                match:
-                    type: StasisEnd
-                    application: testsuite
-            count: 1
 
 properties:
     minversion: '12.0.0'