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

[SVN commits to the Asterisk project]

Author: mjordan
Date: Tue Sep 10 09:06:19 2013
New Revision: 4140

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4140
Log:
Update the confbridge_nominal test for Asterisk 12

This patch updates the confbridge_nominal test for changes in Asterisk 12. It
makes the following changes:
(1) It will now handle PLAYBACK test event messages that are not related to
    a specific sound file playback initiation. In particular, PLAYBACK test
    events in Asterisk 12 will also convey information about control of sound
    file playback.
(2) It updates handling of the bridge media channel. In Asterisk 12, this
    functionality is provided by the CBAnn channel, as opposed to the Bridge
    channel.

(closes issue ASTERISK-22137)
Reported by: mjordan


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=4140&r1=4139&r2=4140
==============================================================================
--- asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test (original)
+++ asterisk/trunk/tests/apps/confbridge/confbridge_nominal/run-test Tue Sep 10 09:06:19 2013
@@ -52,10 +52,13 @@
         channel = ""
         if 'channel' in event:
             channel = event['channel']
-            if "Bridge" in channel:
+            if "Bridge" in channel or "CBAnn" in channel:
                 self.__bridge_channel = channel
         if state == 'PLAYBACK' and channel != "":
             playfile = event.get('message')
+            if playfile is None:
+                # This isn't a message playback
+                return
             if playfile == 'conf-getpin':
                 self.__handle_pin(channel)
             elif playfile == 'vm-rec-name':
@@ -162,6 +165,9 @@
                 self.testCase.expectedEvents['adminunmuted'] = True
         elif state == 'PLAYBACK' and channel != "":
             playfile = event.get('message')
+            if playfile is None:
+                # This isn't a message playback
+                return
             if playfile == 'conf-hasleft':
                 self.__left_notifications += 1
                 if (self.__left_notifications == 2):