[svn-commits] mjordan: testsuite/asterisk/trunk r4319 - /asterisk/trunk/tests/manager/bridg...

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Nov  2 09:53:11 2013
New Revision: 4319

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4319
Log:
bridge_actions: Fix errors that caused test failure.

This patch fixes a number of errors in this test:

* Update BridgeEnter AMI event callback to check the correct values for
  BridgeType and BridgeTechnology

* Fix syntax errors in check_bridge. These syntax errors kept any of the
  callbacks from firing.

* Fix event checking for the UserEvents. User events are 'UserEvent', not
  'Userevent'.

There's no way this test ever passed. :-(

Modified:
    asterisk/trunk/tests/manager/bridge_actions/check_bridge.py
    asterisk/trunk/tests/manager/bridge_actions/test-config.yaml

Modified: asterisk/trunk/tests/manager/bridge_actions/check_bridge.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/bridge_actions/check_bridge.py?view=diff&rev=4319&r1=4318&r2=4319
==============================================================================
--- asterisk/trunk/tests/manager/bridge_actions/check_bridge.py (original)
+++ asterisk/trunk/tests/manager/bridge_actions/check_bridge.py Sat Nov  2 09:53:11 2013
@@ -33,13 +33,13 @@
 
     def failed(self, reason):
         self.send_error("BridgeInfo action failed: %s" % reason)
-        pass
 
     def send_error(self, message):
         LOGGER.error(message)
-        self.ami.userEvent('BridgeInfoFailure', message=message})
+        self.ami.userEvent('BridgeInfoFailure', message=message)
 
     def send_success(self):
+        LOGGER.info('Sending user event for info success')
         self.ami.userEvent('BridgeInfoSuccess')
 
 class bridge_list_callback_container:
@@ -78,9 +78,10 @@
 
     def send_error(self, message):
         LOGGER.error(message)
-        self.ami.userEvent('BridgeListFailure', message=message})
+        self.ami.userEvent('BridgeListFailure', message=message)
 
     def send_success(self):
+        LOGGER.info('Sending user event for list success')
         self.ami.userEvent('BridgeListSuccess')
 
 def get_bridge_info(ami, event):

Modified: asterisk/trunk/tests/manager/bridge_actions/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/bridge_actions/test-config.yaml?view=diff&rev=4319&r1=4318&r2=4319
==============================================================================
--- asterisk/trunk/tests/manager/bridge_actions/test-config.yaml (original)
+++ asterisk/trunk/tests/manager/bridge_actions/test-config.yaml Sat Nov  2 09:53:11 2013
@@ -29,7 +29,8 @@
             match:
                 Event: 'BridgeEnter'
                 Channel: 'SIP/bob-.*'
-                BridgeType: 'simple_bridge'
+                BridgeType: 'basic'
+                BridgeTechnology: 'simple_bridge'
         callbackModule: 'check_bridge'
         callbackMethod: 'get_bridge_info'
         count: '1'
@@ -38,7 +39,7 @@
         id: '0'
         conditions:
             match:
-                Event: 'Userevent'
+                Event: 'UserEvent'
                 UserEvent: 'BridgeListFailure'
         count: '0'
     -
@@ -46,7 +47,7 @@
         id: '0'
         conditions:
             match:
-                Event: 'Userevent'
+                Event: 'UserEvent'
                 UserEvent: 'BridgeInfoFailure'
         count: '0'
     -
@@ -54,7 +55,7 @@
         id: '0'
         conditions:
             match:
-                Event: 'Userevent'
+                Event: 'UserEvent'
                 UserEvent: 'BridgeListSuccess'
         count: '1'
     -
@@ -62,7 +63,7 @@
         id: '0'
         conditions:
             match:
-                Event: 'Userevent'
+                Event: 'UserEvent'
                 UserEvent: 'BridgeInfoSuccess'
         count: '1'