[PATCH 2 of 2 stable] run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()

[Thomas Arendsen Hein]

* Thomas Arendsen Hein <thomas at intevation.de> [20110630 16:44]:
> run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()

Of course 'run-tests: ...' in the first line:

# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Date 1309445059 -7200
# Branch stable
# Node ID f89eb20e3b7a178c096ad8f1f802473064d1b392
# Parent  c7991244cf89756e74aa34c8a1178031ca8e4d4d
run-tests: revert most of 439ed4721a6d, timeout uses fallback for terminate()

diff -r c7991244cf89 -r f89eb20e3b7a 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:44:19 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+')