[asterisk-commits] dvossel: testsuite/asterisk/trunk r316 - in /asterisk/trunk/tests: sip_attend...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri May 28 10:43:03 2010
New Revision: 316

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=316
Log:
makes test using pjsua work with python 2.5

Modified:
    asterisk/trunk/tests/sip_attended_transfer/run-test
    asterisk/trunk/tests/sip_one_legged_transfer/run-test

Modified: asterisk/trunk/tests/sip_attended_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/sip_attended_transfer/run-test?view=diff&rev=316&r1=315&r2=316
==============================================================================
--- asterisk/trunk/tests/sip_attended_transfer/run-test (original)
+++ asterisk/trunk/tests/sip_attended_transfer/run-test Fri May 28 10:43:03 2010
@@ -9,6 +9,7 @@
 
 import sys
 import os
+import signal
 import subprocess
 from optparse import OptionParser
 from twisted.application import service, internet
@@ -121,9 +122,9 @@
     def stopProcesses(self):
         self.logLastStep("Stopping Processes")
         self.asterisk.stop()
-        self.pja.kill()
-        self.pjb.kill()
-        self.pjc.kill()
+        os.kill(self.pja.pid, signal.SIGKILL)
+        os.kill(self.pjb.pid, signal.SIGKILL)
+        os.kill(self.pjc.pid, signal.SIGKILL)
 
     def logLastStep(self, step):
         print step

Modified: asterisk/trunk/tests/sip_one_legged_transfer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/sip_one_legged_transfer/run-test?view=diff&rev=316&r1=315&r2=316
==============================================================================
--- asterisk/trunk/tests/sip_one_legged_transfer/run-test (original)
+++ asterisk/trunk/tests/sip_one_legged_transfer/run-test Fri May 28 10:43:03 2010
@@ -9,6 +9,7 @@
 
 import sys
 import os
+import signal
 import subprocess
 from optparse import OptionParser
 from twisted.application import service, internet
@@ -122,9 +123,10 @@
     def stopProcesses(self):
         self.logLastStep("Stopping Processes")
         self.asterisk.stop()
-        self.pja.kill()
-        self.pjb.kill()
-        self.pjc.kill()
+        os.kill(self.pja.pid, signal.SIGKILL)
+        os.kill(self.pjb.pid, signal.SIGKILL)
+        os.kill(self.pjc.pid, signal.SIGKILL)
+
 
     def logLastStep(self, step):
         print step