# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1309444598 -7200
# Node ID 760d2dae483984816f511e4f7023cb0c3f0e0943
# Parent  2017495bd552e7ec2c6db7214d707b55eefdea78
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()

diff -r 2017495bd552 -r 760d2dae4839 tests/run-tests.py
--- 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+')