[asterisk-commits] twilson: testsuite/asterisk/trunk r2885 - /asterisk/trunk/tests/channels/SIP/...

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Dec 12 14:35:30 2011
New Revision: 2885

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2885
Log:
Fix secure_bridge_media test

Modified:
    asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test

Modified: asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test?view=diff&rev=2885&r1=2884&r2=2885
==============================================================================
--- asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/secure_bridge_media/run-test Mon Dec 12 14:35:30 2011
@@ -36,8 +36,7 @@
         TestCase.run(self)
 
         print "Initiating test call"
-        self.ast[0].cli_exec(
-            "originate Local/1000 at siptest1 application playback tt-monkeys")
+        self.ast[0].cli_originate("Local/1000 at siptest1 application playback tt-monkeys")
 
     # This is called by each Asterisk instance if the call gets connected.
     def fastagi_connect(self, agi):
@@ -59,19 +58,16 @@
             # Drop the AGI connection
             agi.finish()
 
+            if self.connected_chan2 and self.connected_srtp2:
+                print "Test passed"
+                self.passed = True
+                reactor.stop()
+
         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) # 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_chan2 and self.connected_srtp2:
-            print "Test passed"
-            self.passed = True
 
 def main():
     test = SIPCallTest()