[asterisk-commits] kmoore: testsuite/asterisk/trunk r4686 - /asterisk/trunk/tests/apps/confbridg...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Feb 11 09:05:06 2014
New Revision: 4686

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4686
Log:
Testsuite: Fix confbridge_marked test

The conf-placeintoconf sound is no longer played and its replacement is
not played unless there are waitmarked users in the conference prior to
a marked user entering. This corrects the expected behavior of the test.

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=4686&r1=4685&r2=4686
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_marked/test-config.yaml Tue Feb 11 09:05:06 2014
@@ -152,18 +152,6 @@
               type: 'headermatch'
               conditions:
                 match:
-                  Event: 'TestEvent'
-                  Channel: 'Local/marked_one at confbridge-.*'
-                  State: 'PLAYBACK'
-                  Message: 'conf-placeintoconf'
-              actions:
-                -
-                  action-type: 'set-expected-result'
-                  expected-result: 'Marked-1 Notified of Placed in Conference'
-            -
-              type: 'headermatch'
-              conditions:
-                match:
                   Event: 'MusicOnHold'
                   Channel: 'Local/marked_one at confbridge-.*'
                   State: 'Start'
@@ -215,21 +203,6 @@
                   # they have the quiet flag
                   action-type: 'fail-test'
                   expected-result: 'Marked-2 heard join sound when they had the Quiet flag set'
-            -
-              type: 'headermatch'
-              conditions:
-                match:
-                  Event: 'TestEvent'
-                  Channel: 'Local/marked_two at confbridge-.*'
-                  State: 'PLAYBACK'
-                  Message: 'conf-placeintoconf'
-              actions:
-                -
-                  # Note that Marked-2 should not be notified that they
-                  # were placed into the conference, as they have the
-                  # quiet flag
-                  action-type: 'fail-test'
-                  message: 'Marked-2 heard placedintoconf when they had the Quiet flag set'
     -
       # Scenario 2: Marked User Two (Quiet flag) enters.  Verify that they
       # receive no notifications that they are in the conference.  Marked User
@@ -360,20 +333,6 @@
                 -
                   action-type: 'set-expected-result'
                   expected-result: 'Marked-1 Heard Join Sound'
-            -
-              type: 'headermatch'
-              conditions:
-                match:
-                  Event: 'TestEvent'
-                  Channel: 'Local/marked_one at confbridge-.*'
-                  State: 'PLAYBACK'
-                  Message: 'conf-placeintoconf'
-              actions:
-                -
-                  # Marked-1 was second in conference; should not have this
-                  # sound file played
-                  action-type: 'fail-test'
-                  expected-result: 'Marked-1 Notified of Placed in Conference when they were not first participant'
         -
           channel-id: 'Marked-2'
           channel-name: 'Local/marked_two at confbridge'
@@ -417,21 +376,6 @@
                   # they have the quiet flag
                   action-type: 'fail-test'
                   expected-result: 'Marked-2 heard join sound when they had the Quiet flag set'
-            -
-              type: 'headermatch'
-              conditions:
-                match:
-                  Event: 'TestEvent'
-                  Channel: 'Local/marked_two at confbridge-.*'
-                  State: 'PLAYBACK'
-                  Message: 'conf-placeintoconf'
-              actions:
-                -
-                  # Note that Marked-2 should not be notified that they
-                  # were placed into the conference, as they have the
-                  # quiet flag
-                  action-type: 'fail-test'
-                  message: 'Marked-2 heard placedintoconf when they had the Quiet flag set'
             -
               type: 'headermatch'
               conditions: