|
19 | 19 | import os
|
20 | 20 | import time
|
21 | 21 | import shutil
|
22 |
| -import signal |
23 |
| -import sys |
24 | 22 | import subprocess
|
| 23 | +import sys |
25 | 24 | import tempfile
|
26 | 25 | import re
|
27 | 26 | import logging
|
@@ -366,11 +365,10 @@ def main():
|
366 | 365 | args=passon_args,
|
367 | 366 | combined_logs_len=args.combinedlogslen,
|
368 | 367 | failfast=args.failfast,
|
369 |
| - runs_ci=args.ci, |
370 | 368 | use_term_control=args.ansi,
|
371 | 369 | )
|
372 | 370 |
|
373 |
| -def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, runs_ci, use_term_control): |
| 371 | +def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, use_term_control): |
374 | 372 | args = args or []
|
375 | 373 |
|
376 | 374 | # Warn if bitcoind is already running
|
@@ -412,7 +410,6 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=
|
412 | 410 | tmpdir=tmpdir,
|
413 | 411 | test_list=test_list,
|
414 | 412 | flags=flags,
|
415 |
| - timeout_duration=40 * 60 if runs_ci else float('inf'), # in seconds |
416 | 413 | use_term_control=use_term_control,
|
417 | 414 | )
|
418 | 415 | start_time = time.time()
|
@@ -497,12 +494,11 @@ class TestHandler:
|
497 | 494 | Trigger the test scripts passed in via the list.
|
498 | 495 | """
|
499 | 496 |
|
500 |
| - def __init__(self, *, num_tests_parallel, tests_dir, tmpdir, test_list, flags, timeout_duration, use_term_control): |
| 497 | + def __init__(self, *, num_tests_parallel, tests_dir, tmpdir, test_list, flags, use_term_control): |
501 | 498 | assert num_tests_parallel >= 1
|
502 | 499 | self.num_jobs = num_tests_parallel
|
503 | 500 | self.tests_dir = tests_dir
|
504 | 501 | self.tmpdir = tmpdir
|
505 |
| - self.timeout_duration = timeout_duration |
506 | 502 | self.test_list = test_list
|
507 | 503 | self.flags = flags
|
508 | 504 | self.num_running = 0
|
@@ -543,10 +539,6 @@ def get_next(self):
|
543 | 539 | time.sleep(.5)
|
544 | 540 | for job in self.jobs:
|
545 | 541 | (name, start_time, proc, testdir, log_out, log_err) = job
|
546 |
| - if int(time.time() - start_time) > self.timeout_duration: |
547 |
| - # Timeout individual tests if timeout is specified (to stop |
548 |
| - # tests hanging and not providing useful output). |
549 |
| - proc.send_signal(signal.SIGINT) |
550 | 542 | if proc.poll() is not None:
|
551 | 543 | log_out.seek(0), log_err.seek(0)
|
552 | 544 | [stdout, stderr] = [log_file.read().decode('utf-8') for log_file in (log_out, log_err)]
|
|
0 commit comments