##// END OF EJS Templates
run-tests: drop fallback for proc.terminate() for pre-py2.6
Martin von Zweigbergk -
r32303:dc131b97 default
parent child Browse files
Show More
@@ -523,10 +523,10 b' def log(*msg):'
523 sys.stdout.flush()
523 sys.stdout.flush()
524
524
525 def terminate(proc):
525 def terminate(proc):
526 """Terminate subprocess (with fallback for Python versions < 2.6)"""
526 """Terminate subprocess"""
527 vlog('# Terminating process %d' % proc.pid)
527 vlog('# Terminating process %d' % proc.pid)
528 try:
528 try:
529 getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
529 proc.terminate()
530 except OSError:
530 except OSError:
531 pass
531 pass
532
532
General Comments 0
You need to be logged in to leave comments. Login now