Mercurial > hg-stable

changeset 14822:760d2dae4839 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Jun 2011 16:36:38 +0200
parents 2017495bd552
children f5bfb27b64e3 7698c275aa56
files tests/run-tests.py
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Thu Jun 30 16:25:05 2011 +0200
+++ b/tests/run-tests.py	Thu Jun 30 16:36:38 2011 +0200
@@ -259,10 +259,6 @@
             sys.stderr.write(
                 'warning: --timeout option ignored with --debug\n')
         options.timeout = 0
-    if options.timeout and not hasattr(subprocess.Popen, 'terminate'):
-        sys.stderr.write('warning: timeout is not supported on this '
-                         'platform and will be ignored\n')
-        options.timeout = 0
     if options.py3k_warnings:
         if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0):
             parser.error('--py3k-warnings can only be used on Python 2.6+')