comparison tests/run-tests.py @ 14337:439ed4721a6d

run-tests: ignore timeout when Popen.terminate is unavailable

Popen.terminate was introduced in python 2.6

14336:0cbf0d1f7939

    p.fromchild = p.stdout
    p.tochild = p.stdin
    p.childerr = p.stderr

    if timeout:
        p.timeout = False
        def t():
            start = time.time()
            while time.time() - start < timeout and p.returncode is None:
                time.sleep(1)
            p.timeout = True

    if options.debug:
        if options.timeout != defaults['timeout']:
            sys.stderr.write(
                'warning: --timeout option ignored with --debug\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+')
    if options.blacklist:
        blacklist = dict()

14337:439ed4721a6d

    p.fromchild = p.stdout
    p.tochild = p.stdin
    p.childerr = p.stderr

    p.timeout = False
    if timeout:
        def t():
            start = time.time()
            while time.time() - start < timeout and p.returncode is None:
                time.sleep(1)
            p.timeout = True

    if options.debug:
        if options.timeout != defaults['timeout']:
            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')
        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+')
    if options.blacklist:
        blacklist = dict()