[asterisk-commits] mjordan: testsuite/asterisk/trunk r5470 - in /asterisk/trunk/tests/manager: e...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Aug 17 14:07:49 2014
New Revision: 5470

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5470
Log:
(presence|exten)_state_list: Ignore completion event when verifying params

On the build agents, the completion events are getting passed to the parameter
checks. This patch prevents those events from being processed by the routines
that verify parameters, as those routines are only supposed to inspect the
intermediate events.

Modified:
    asterisk/trunk/tests/manager/exten_state_list/ami_exten_state_list.py
    asterisk/trunk/tests/manager/presence_state_list/ami_presence_state_list.py

Modified: asterisk/trunk/tests/manager/exten_state_list/ami_exten_state_list.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/exten_state_list/ami_exten_state_list.py?view=diff&rev=5470&r1=5469&r2=5470
==============================================================================
--- asterisk/trunk/tests/manager/exten_state_list/ami_exten_state_list.py (original)
+++ asterisk/trunk/tests/manager/exten_state_list/ami_exten_state_list.py Sun Aug 17 14:07:49 2014
@@ -139,6 +139,10 @@
             # Not for us!
             return
 
+        if (event.get('event') != 'ExtensionStatus'):
+            # Ignore completion event
+            return
+
         self.check_parameter(event, 'exten')
         self.check_parameter(event, 'status')
         self.check_parameter(event, 'statustext')
@@ -147,7 +151,7 @@
         if self.state_pos == len(EXPECTED_STATES):
             self.test_object.set_passed(True)
         elif self.state_pos > len(EXPECTED_STATES):
-            LOGGER.error("Oh snap, we got %d presence updates but expected %d" %
+            LOGGER.error("Oh snap, we got %d updates but expected %d" %
                 (self.state_pos, len(EXPECTED_STATES)))
             self.test_object.set_passed(False)
 

Modified: asterisk/trunk/tests/manager/presence_state_list/ami_presence_state_list.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/presence_state_list/ami_presence_state_list.py?view=diff&rev=5470&r1=5469&r2=5470
==============================================================================
--- asterisk/trunk/tests/manager/presence_state_list/ami_presence_state_list.py (original)
+++ asterisk/trunk/tests/manager/presence_state_list/ami_presence_state_list.py Sun Aug 17 14:07:49 2014
@@ -125,6 +125,10 @@
             # Not for us!
             return
 
+        if (event.get('event') != 'PresenceStateChange'):
+            # Ignore completion event
+            return
+
         self.check_parameter(event, 'status')
         self.check_parameter(event, 'subtype')
         self.check_parameter(event, 'message')