[asterisk-commits] jrose: testsuite/asterisk/trunk r4210 - in /asterisk/trunk/tests/channels/SIP...

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Sep 20 15:47:00 2013
New Revision: 4210

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4210
Log:
Testsuite: Fix failing reactor stops on sip_custom_presence tests

I noticed Asterisk wasn't stopping after these tests and this was even causing
a couple test failures for me on occasion. This patch fixes these tests to use
the correct method of stopping reactor so that no lingering Asterisk instances
are left open. This may or may not close the multiple_state_change test hang
issue.

(issue ASTERISK-22216)
Reported by: Matt Jordan

Modified:
    asterisk/trunk/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test
    asterisk/trunk/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test
    asterisk/trunk/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test
    asterisk/trunk/tests/channels/SIP/sip_custom_presence/resubscribe/run-test

Modified: asterisk/trunk/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test?view=diff&rev=4210&r1=4209&r2=4210
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_custom_presence/multiple_state_change/run-test Fri Sep 20 15:47:00 2013
@@ -40,7 +40,7 @@
         LOGGER.info("SIPp scenario passed successfully. Raising sippPassed "
                     "flag.")
         self.sippPassed = True
-        reactor.stop()
+        self.stop_reactor()
 
     def originateComplete(self, result):
         LOGGER.info("Completed originated call for setting presence to "

Modified: asterisk/trunk/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test?view=diff&rev=4210&r1=4209&r2=4210
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_custom_presence/nominal_state_change/run-test Fri Sep 20 15:47:00 2013
@@ -37,7 +37,7 @@
 
     def sippComplete(self, result):
         self.sippPassed = True
-        reactor.stop()
+        self.stop_reactor()
 
     def runSippTest(self):
         df = self.sipTest.run(self)

Modified: asterisk/trunk/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test?view=diff&rev=4210&r1=4209&r2=4210
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_custom_presence/non_digium_state_change/run-test Fri Sep 20 15:47:00 2013
@@ -36,7 +36,7 @@
 
     def testComplete(self, result):
         self.sippPassed = True
-        reactor.stop()
+        self.stop_reactor()
 
     def originateComplete(self, ami, event):
         # We successfully set presence, now let's change device state

Modified: asterisk/trunk/tests/channels/SIP/sip_custom_presence/resubscribe/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_custom_presence/resubscribe/run-test?view=diff&rev=4210&r1=4209&r2=4210
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_custom_presence/resubscribe/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_custom_presence/resubscribe/run-test Fri Sep 20 15:47:00 2013
@@ -52,7 +52,7 @@
 
     def sippResubscribeComplete(self, result):
         self.sippPassed = True
-        reactor.stop()
+        self.stop_reactor()
 
     def originateComplete(self, ami, event):
         if not event.get("userevent") == "Presence":