[asterisk-commits] mjordan: testsuite/asterisk/trunk r4881 - /asterisk/trunk/tests/apps/confbrid...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Mar 19 22:04:04 2014
New Revision: 4881

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4881
Log:
conbridge_marked: Move scenario finished trigger back to ConfbridgeEnd event

The order of events should be the TestEvent indicating going from SINGLE_MARKED
to EMPTY, followed by the ConfbridgeEnd event. The triggering of the end of the
scenario should be based on this event.

Modified:
    asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml

Modified: asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml?view=diff&rev=4881&r1=4880&r2=4881
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml Wed Mar 19 22:04:04 2014
@@ -94,8 +94,6 @@
             -
               action-type: 'set-expected-result'
               expected-result: 'Conference transitioned from SINGLE_MARKED to EMPTY'
-            -
-              action-type: 'end-scenario'
         -
           type: 'headermatch'
           conditions:
@@ -106,6 +104,8 @@
             -
               action-type: 'set-expected-result'
               expected-result: 'Conference Ended'
+            -
+              action-type: 'end-scenario'
       channels:
         -
           channel-id: 'Marked-1'