[asterisk-commits] rmudgett: branch rmudgett/srtp r1678 - in /asterisk/team/rmudgett/srtp/tests/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun 24 11:53:42 2011
New Revision: 1678

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=1678
Log:
Get secure_bridge_media test working.

Modified:
    asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/configs/ast1/extensions.conf
    asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/run-test

Modified: asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/configs/ast1/extensions.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/configs/ast1/extensions.conf?view=diff&rev=1678&r1=1677&r2=1678
==============================================================================
--- asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/configs/ast1/extensions.conf (original)
+++ asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/configs/ast1/extensions.conf Fri Jun 24 11:53:42 2011
@@ -6,5 +6,6 @@
 
 exten => 1000,1,Set(CHANNEL(secure_bridge_media)=1)
 exten => 1000,n,Set(TEST_RESULT=${CHANNEL} secure_media=${CHANNEL(secure_media)})
-exten => 1000,n,AGI(agi://127.0.0.1:4573)
+;No need to report to the test script since this is the wrong channel anyway.
+;exten => 1000,n,AGI(agi://127.0.0.1:4573)
 exten => 1000,n,Dial(SIP/2000/2000)

Modified: asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/run-test?view=diff&rev=1678&r1=1677&r2=1678
==============================================================================
--- asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/run-test (original)
+++ asterisk/team/rmudgett/srtp/tests/channels/SIP/secure_bridge_media/run-test Fri Jun 24 11:53:42 2011
@@ -45,7 +45,7 @@
     def fastagi_connect(self, agi):
         def get_test_result(val):
             print "Connection result '%s'" % val
-            if val.split("-")[0] == "SIP/2000":
+            if val.split(" ")[0] == "Console/dsp":
                 # Outgoing call on Ast1
                 self.connected_chan1 = True
                 if val.split("=")[1] == "1":
@@ -58,17 +58,20 @@
             else:
                 print "Don't know which side is connected."
 
+            # Drop the AGI connection
+            agi.finish()
+
         agi.getVariable("TEST_RESULT").addCallback(get_test_result)
 
     def stop_asterisk(self):
         TestCase.stop_asterisk(self)
 
         # Determine if the test passed
-        print "self.connected_chan1:%s" % (self.connected_chan1)
-        print "self.connected_srtp1:%s" % (self.connected_srtp1)
+        print "self.connected_chan1:%s" % (self.connected_chan1) # Don't care since for the wrong channel anyway
+        print "self.connected_srtp1:%s" % (self.connected_srtp1) # Don't care since for the wrong channel anyway
         print "self.connected_chan2:%s" % (self.connected_chan2)
         print "self.connected_srtp2:%s" % (self.connected_srtp2)
-        if self.connected_chan1 and self.connected_srtp1 and self.connected_chan2 and self.connected_srtp2:
+        if self.connected_chan2 and self.connected_srtp2:
             print "Test passed"
             self.passed = True