[asterisk-commits] kmoore: testsuite/asterisk/trunk r3308 - in /asterisk/trunk/tests/channels/SI...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Jul 10 14:23:37 2012
New Revision: 3308

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3308
Log:
Fix a deferred backtrace in the generic_ccss test

This was not actually causing a test error, but was adding unnecessary
noise to debug logs.  The CCSS callback that was executing after the
macro and subroutine calls was not being handled.  This is now handled
and tested for.

(closes issue ASTERISK-20029)

Modified:
    asterisk/trunk/tests/channels/SIP/generic_ccss/configs/ast2/extensions.conf
    asterisk/trunk/tests/channels/SIP/generic_ccss/run-test

Modified: asterisk/trunk/tests/channels/SIP/generic_ccss/configs/ast2/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/generic_ccss/configs/ast2/extensions.conf?view=diff&rev=3308&r1=3307&r2=3308
==============================================================================
--- asterisk/trunk/tests/channels/SIP/generic_ccss/configs/ast2/extensions.conf (original)
+++ asterisk/trunk/tests/channels/SIP/generic_ccss/configs/ast2/extensions.conf Tue Jul 10 14:23:37 2012
@@ -1,5 +1,9 @@
+[globals]
+REPEAT=0
 [to-bob]
 exten => 1234,1,noop
+exten => 1234,n,GotoIf(${GLOBAL(REPEAT)}?done,1,1)
+exten => 1234,n,Set(GLOBAL(REPEAT)=1)
 exten => 1234,n,set(EVENT=call-failed)
 exten => 1234,n,dial(SIP/bob)
 
@@ -20,3 +24,7 @@
 [dpwait]
 exten => 1234,1,answer
 exten => 1234,n,echo()
+
+[done]
+exten => 1,1,NoOp("Executed callback")
+exten => 1,2,UserEvent(CCSSStatus,status: callback)

Modified: asterisk/trunk/tests/channels/SIP/generic_ccss/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/generic_ccss/run-test?view=diff&rev=3308&r1=3307&r2=3308
==============================================================================
--- asterisk/trunk/tests/channels/SIP/generic_ccss/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/generic_ccss/run-test Tue Jul 10 14:23:37 2012
@@ -55,6 +55,9 @@
         elif event ['status'] == "macro":
             LOGGER.info("macro executed as expected")
             self.success_count += 1
+        elif event ['status'] == "callback":
+            LOGGER.info("callback executed as expected")
+            self.success_count += 1
         elif event ['status'] == "BOB":
             LOGGER.info("Bouncing a call off the ccss test instance (ast2) now that bob is occupied")
             df = self.ami[0].originate("local/1234 at dial-alice", "dpwait", "1234", 1)
@@ -72,8 +75,8 @@
         self.are_we_there_yet()
 
     def are_we_there_yet(self):
-        if self.event_count == 5:
-            if self.success_count == 2:
+        if self.event_count == 6:
+            if self.success_count == 3:
                 self.passed = True
             self.stop_reactor()