changeset 32343 | dc131b9772f2 |
parent 32342 | 8627cf4de929 |
child 32350 | b96be0098624 |
--- a/tests/run-tests.py Tue May 16 14:40:22 2017 -0700 +++ b/tests/run-tests.py Tue May 16 14:42:13 2017 -0700 @@ -523,10 +523,10 @@ sys.stdout.flush() def terminate(proc): - """Terminate subprocess (with fallback for Python versions < 2.6)""" + """Terminate subprocess""" vlog('# Terminating process %d' % proc.pid) try: - getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))() + proc.terminate() except OSError: pass