[svn-commits] coreyfarrell: testsuite/asterisk/trunk r5887 - in /asterisk/trunk: lib/python...

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Tue Nov  4 14:57:51 2014
New Revision: 5887

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5887
Log:
Close HTTP connections when test is completed.

Prevent reference leaks in tests/phoneprov/res_phoneprov and
tests/manager/config by closing HTTP connections when the
test is complete.

Review: https://reviewboard.asterisk.org/r/4143/

Modified:
    asterisk/trunk/lib/python/asterisk/syncami.py
    asterisk/trunk/tests/channels/SIP/pcap_demo/run-test
    asterisk/trunk/tests/manager/config/ManagerConfigTest.py
    asterisk/trunk/tests/phoneprov/res_phoneprov/run-test

Modified: asterisk/trunk/lib/python/asterisk/syncami.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/syncami.py?view=diff&rev=5887&r1=5886&r2=5887
==============================================================================
--- asterisk/trunk/lib/python/asterisk/syncami.py (original)
+++ asterisk/trunk/lib/python/asterisk/syncami.py Tue Nov  4 14:57:51 2014
@@ -57,7 +57,9 @@
 
     def logoff(self):
         """Log out of AMI"""
-        return self.send({'action': 'logoff'})
+        result = self.send({'action': 'logoff'})
+        self.con.close()
+        return result
 
     def send(self, args):
         """Send an AMI request "action" given a dict of header values

Modified: asterisk/trunk/tests/channels/SIP/pcap_demo/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/pcap_demo/run-test?view=diff&rev=5887&r1=5886&r2=5887
==============================================================================
--- asterisk/trunk/tests/channels/SIP/pcap_demo/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/pcap_demo/run-test Tue Nov  4 14:57:51 2014
@@ -8,7 +8,6 @@
 sys.path.append("lib/python")
 
 from asterisk.test_case import TestCase
-from asterisk.syncami import SyncAMI
 from sip_message import SIPMessage, SIPMessageTest
 
 from twisted.internet import reactor

Modified: asterisk/trunk/tests/manager/config/ManagerConfigTest.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/config/ManagerConfigTest.py?view=diff&rev=5887&r1=5886&r2=5887
==============================================================================
--- asterisk/trunk/tests/manager/config/ManagerConfigTest.py (original)
+++ asterisk/trunk/tests/manager/config/ManagerConfigTest.py Tue Nov  4 14:57:51 2014
@@ -34,6 +34,7 @@
                 self.run_test(x)
                 if (not self.passed):
                     break
+            self.syncami.logoff()
         except Exception as e:
             self.passed = False
             LOGGER.error("Exception caught: %s" % e)

Modified: asterisk/trunk/tests/phoneprov/res_phoneprov/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/phoneprov/res_phoneprov/run-test?view=diff&rev=5887&r1=5886&r2=5887
==============================================================================
--- asterisk/trunk/tests/phoneprov/res_phoneprov/run-test (original)
+++ asterisk/trunk/tests/phoneprov/res_phoneprov/run-test Tue Nov  4 14:57:51 2014
@@ -27,6 +27,10 @@
         super(ResPhoneprovTest, self).__init__()
         self.reactor_timeout = 15
         self.create_asterisk()
+
+    def stop_reactor(self):
+        self.con.close()
+        super(ResPhoneprovTest, self).stop_reactor()
 
     def run(self):
         super(ResPhoneprovTest, self).run()