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

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Feb 10 10:07:19 2014
New Revision: 4676

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4676
Log:
Testsuite: Update confbridge test for a bugfix

This removes the check for the conf-placeintoconf sound since it is no
longer triggered and the replacement is not triggered under these
circumstances.

(closes issue PQ-1396)
Reported by: Steve Pitts

Modified:
    asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test

Modified: asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test?view=diff&rev=4676&r1=4675&r2=4676
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test Mon Feb 10 10:07:19 2014
@@ -71,8 +71,6 @@
                 self.test_case.expectedEvents['onlyperson'] = True
             elif playfile == 'confbridge-join':
                 self.__handle_confbridge_join(channel)
-            elif playfile == 'conf-placeintoconf':
-                self.test_case.expectedEvents['onlypersonplaced'] = True
             elif 'confbridge-name' in playfile:
                 self.__played_names += 1
                 if (self.__played_names == self.__recorded_names):
@@ -208,7 +206,6 @@
 
         """ Add the events we expect to receive in order for the test to pass """
         self.expectedEvents['onlyperson'] = False               # User is told when they are the only person in conference
-        self.expectedEvents['onlypersonplaced'] = False         # User, when only person, is told when they are put into conference
         self.expectedEvents['userpin'] = False                  # User is prompted for a pin (when configured)
         self.expectedEvents['adminpin'] = False                 # Admin user is prompted for a pin (when configured)
         self.expectedEvents['recordname'] = False               # User is prompted to record name (when configured)