diff options
author | Chun Kuan Lee <ken2812221@gmail.com> | 2018-10-30 21:06:44 +0800 |
---|---|---|
committer | Chun Kuan Lee <ken2812221@gmail.com> | 2018-10-30 21:19:43 +0800 |
commit | 4bd125fff080d1d1f20d0259836d55bb685be6d2 (patch) | |
tree | 094e9a84b15c105d135718f80bcecfa42f1a8a9d | |
parent | 29f429dc7d4c7e6cd012e749cadf89e3138bcab3 (diff) | |
download | bitcoin-4bd125fff080d1d1f20d0259836d55bb685be6d2.tar.xz |
tests: Print dots by default
-rwxr-xr-x | test/functional/test_runner.py | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 620554ffe4..85a5de6976 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -222,7 +222,7 @@ def main(): parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit') parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.') parser.add_argument('--keepcache', '-k', action='store_true', help='the default behavior is to flush the cache directory on startup. --keepcache retains the cache from the previous testrun.') - parser.add_argument('--quiet', '-q', action='store_true', help='only print results summary and failure logs') + parser.add_argument('--quiet', '-q', action='store_true', help='only print dots, results summary and failure logs') parser.add_argument('--tmpdirprefix', '-t', default=tempfile.gettempdir(), help="Root directory for datadirs") parser.add_argument('--failfast', action='store_true', help='stop execution after the first test failure') args, unknown_args = parser.parse_known_args() @@ -321,11 +321,10 @@ def main(): enable_coverage=args.coverage, args=passon_args, combined_logs_len=args.combinedlogslen, - failfast=args.failfast, - level=logging_level + failfast=args.failfast ) -def run_tests(test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False, level=logging.DEBUG): +def run_tests(test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=False, args=None, combined_logs_len=0, failfast=False): args = args or [] # Warn if bitcoind is already running (unix only) @@ -360,7 +359,7 @@ def run_tests(test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=Fal raise #Run Tests - job_queue = TestHandler(jobs, tests_dir, tmpdir, test_list, flags, level) + job_queue = TestHandler(jobs, tests_dir, tmpdir, test_list, flags) start_time = time.time() test_results = [] @@ -441,14 +440,13 @@ class TestHandler: Trigger the test scripts passed in via the list. """ - def __init__(self, num_tests_parallel, tests_dir, tmpdir, test_list=None, flags=None, logging_level=logging.DEBUG): + def __init__(self, num_tests_parallel, tests_dir, tmpdir, test_list=None, flags=None): assert(num_tests_parallel >= 1) self.num_jobs = num_tests_parallel self.tests_dir = tests_dir self.tmpdir = tmpdir self.test_list = test_list self.flags = flags - self.logging_level = logging_level self.num_running = 0 self.jobs = [] @@ -496,14 +494,12 @@ class TestHandler: status = "Failed" self.num_running -= 1 self.jobs.remove(job) - if self.logging_level == logging.DEBUG: - clearline = '\r' + (' ' * dot_count) + '\r' - print(clearline, end='', flush=True) - dot_count = 0 + clearline = '\r' + (' ' * dot_count) + '\r' + print(clearline, end='', flush=True) + dot_count = 0 return TestResult(name, status, int(time.time() - start_time)), testdir, stdout, stderr - if self.logging_level == logging.DEBUG: - print('.', end='', flush=True) - dot_count += 1 + print('.', end='', flush=True) + dot_count += 1 def kill_and_join(self): """Send SIGKILL to all jobs and block until all have ended.""" |