[PATCH 2 of 2] run-tests: drop fallback for proc.terminate() for pre-py2.7
Martin von Zweigbergk
martinvonz at google.com
Tue May 16 17:53:20 EDT 2017
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1494970933 25200
# Tue May 16 14:42:13 2017 -0700
# Node ID 40067709292af7cca062f2f88e3d808d28400df2
# Parent e97e9dac1ede83367bdb494820276f67f0c8f269
run-tests: drop fallback for proc.terminate() for pre-py2.7
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -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
More information about the Mercurial-devel
mailing list