# HG changeset patch # User Martin von Zweigbergk # Date 1494970933 25200 # Node ID dc131b9772f2738d11867c7ae91e49c70f817b0b # Parent 8627cf4de929035f17e6676318e385d62fef3910 run-tests: drop fallback for proc.terminate() for pre-py2.6 diff -r 8627cf4de929 -r dc131b9772f2 tests/run-tests.py --- 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