Mercurial > public > mercurial-scm > hg-stable

diff tests/run-tests.py @ 14971:0b21ae0a2366

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use getattr instead of hasattr
author Augie Fackler <durin42@gmail.com>
date Mon, 25 Jul 2011 16:37:18 -0500
parents b601b9eb372d
children 4fae5df4b1bb
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Jul 25 16:05:01 2011 -0500
+++ b/tests/run-tests.py	Mon Jul 25 16:37:18 2011 -0500
@@ -340,10 +340,7 @@
     """Terminate subprocess (with fallback for Python versions < 2.6)"""
     vlog('# Terminating process %d' % proc.pid)
     try:
-        if hasattr(proc, 'terminate'):
-            proc.terminate()
-        else:
-            os.kill(proc.pid, signal.SIGTERM)
+        getattr(proc, 'terminate', lambda : os.kill(proc.pid, signal.SIGTERM))()
     except OSError:
         pass