[asterisk-commits] mjordan: testsuite/asterisk/trunk r4207 - /asterisk/trunk/runtests.py

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Sep 19 21:54:59 2013
New Revision: 4207

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=4207
Log:
Kill SIPp between test runs

When things go off the rails, they can go *way* off the rails. This is
particularly true of SIPp based tests, which can leave orphaned SIPp
processes still bound to addresses. All subsequent tests that use SIPp
then fail; finding the original culprit can be a bit of a pain.

We already kill Asterisk between test runs. We now kill SIPp as well.

Modified:
    asterisk/trunk/runtests.py

Modified: asterisk/trunk/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/runtests.py?view=diff&rev=4207&r1=4206&r2=4207
==============================================================================
--- asterisk/trunk/runtests.py (original)
+++ asterisk/trunk/runtests.py Thu Sep 19 21:54:59 2013
@@ -82,7 +82,7 @@
             if not self.passed:
                 self.__archive_ast_logs()
                 self.__archive_pcap_dump()
-            print 'Test %s %s' % (cmd, 'passed' if self.passed else 'failed')
+            print 'Test %s %s\n' % (cmd, 'passed' if self.passed else 'failed')
 
         else:
             print "FAILED TO EXECUTE %s, it must exist and be executable" % cmd
@@ -293,11 +293,13 @@
                 if exclude:
                     continue
 
-            print "--> Running test '%s' ...\n" % t.test_name
+            print "--> Running test '%s' ..." % t.test_name
 
             # Establish Preconditions
             print "Making sure Asterisk isn't running ..."
             os.system("killall -9 asterisk > /dev/null 2>&1")
+            print "Making sure SIPp isn't running..."
+            os.system("killall -9 sipp > /dev/null 2>&1")
             # XXX TODO Hard coded path, gross.
             os.system("rm -f /var/run/asterisk/asterisk.ctl")
             os.system("rm -f /var/run/asterisk/asterisk.pid")