[svn-commits] wdoekes: testsuite/asterisk/trunk r2987 - in /asterisk/trunk/tests/channels/S...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jan 9 14:19:07 CST 2012
Author: wdoekes
Date: Mon Jan 9 14:19:03 2012
New Revision: 2987
URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=2987
Log:
Re-enable SIP/sip_tls_register stop_reactor (otherwise it fails to quit) and add comment about no-op option in SIP/sip_tls_call test.
Modified:
asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast1/sip.conf
asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast2/sip.conf
asterisk/trunk/tests/channels/SIP/sip_tls_register/configs/ast1/sip.conf
asterisk/trunk/tests/channels/SIP/sip_tls_register/run-test
Modified: asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast1/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast1/sip.conf?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast1/sip.conf (original)
+++ asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast1/sip.conf Mon Jan 9 14:19:03 2012
@@ -16,7 +16,7 @@
tlsdontverifyserver=yes
tlscipher=ALL
-tlsclientmethod==tlsv1
+tlsclientmethod=tlsv1 ; (Doesn't do anything in this test.)
[testast1]
username=testast2
Modified: asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast2/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast2/sip.conf?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast2/sip.conf (original)
+++ asterisk/trunk/tests/channels/SIP/sip_tls_call/configs/ast2/sip.conf Mon Jan 9 14:19:03 2012
@@ -26,7 +26,7 @@
tlsdontverifyserver=yes
tlscipher=ALL
-tlsclientmethod==tlsv1
+tlsclientmethod=tlsv1 ; (Doesn't do anything in this test.)
[testast2]
secret=blahblah
Modified: asterisk/trunk/tests/channels/SIP/sip_tls_register/configs/ast1/sip.conf
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_tls_register/configs/ast1/sip.conf?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_tls_register/configs/ast1/sip.conf (original)
+++ asterisk/trunk/tests/channels/SIP/sip_tls_register/configs/ast1/sip.conf Mon Jan 9 14:19:03 2012
@@ -12,7 +12,7 @@
tlsdontverifyserver=yes
tlscipher=ALL
-tlsclientmethod==tlsv1
+tlsclientmethod=tlsv1 ; (Doesn't do anything in this test.)
[v4-in]
type=friend
Modified: asterisk/trunk/tests/channels/SIP/sip_tls_register/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_tls_register/run-test?view=diff&rev=2987&r1=2986&r2=2987
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_tls_register/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_tls_register/run-test Mon Jan 9 14:19:03 2012
@@ -95,8 +95,7 @@
self.pass_sipp = scenario.waitAndEvaluate()
if (self.pass_sipp and self.pass_event):
self.passed = True
- #avoid stop_reactor until testsuite crashes are solved
- #self.stop_reactor()
+ self.stop_reactor()
# Callback for PeerStatus events, checks to see if the correct peer registered successfully.
def check_register_result(self, ami, event):
@@ -115,8 +114,7 @@
self.pass_event = True
if (self.pass_event and self.pass_sipp):
self.passed = True
- #avoid stop_reactor until testsuite crashes are solved
- #self.stop_reactor()
+ self.stop_reactor()
return
else:
logger.info("Registration for peer %s in state %s" % (peer, status))
More information about the svn-commits
mailing list