Skip to content

Commit 55992f1

Browse files
committed
Add --quiet option to suppress rpc-tests.py output
rpt-tests.py outputs progress information as it runs tests. This commit adds a --quiet option that suppresses that progress output and only prints a summary of results (and logs from failed tests).
1 parent 5114f81 commit 55992f1

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

test/functional/test_runner.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import subprocess
2424
import tempfile
2525
import re
26+
import logging
2627

2728
TEST_EXIT_PASSED = 0
2829
TEST_EXIT_SKIPPED = 77
@@ -141,6 +142,7 @@ def main():
141142
parser.add_argument('--force', '-f', action='store_true', help='run tests even on platforms where they are disabled by default (e.g. windows).')
142143
parser.add_argument('--help', '-h', '-?', action='store_true', help='print help text and exit')
143144
parser.add_argument('--jobs', '-j', type=int, default=4, help='how many test scripts to run in parallel. Default=4.')
145+
parser.add_argument('--quiet', '-q', action='store_true', help='only print results summary and failure logs')
144146
parser.add_argument('--nozmq', action='store_true', help='do not run the zmq tests')
145147
args, unknown_args = parser.parse_known_args()
146148

@@ -152,6 +154,10 @@ def main():
152154
config = configparser.ConfigParser()
153155
config.read_file(open(os.path.dirname(__file__) + "/config.ini"))
154156

157+
# Set up logging
158+
logging_level = logging.INFO if args.quiet else logging.DEBUG
159+
logging.basicConfig(format='%(message)s', level=logging_level)
160+
155161
enable_wallet = config["components"].getboolean("ENABLE_WALLET")
156162
enable_utils = config["components"].getboolean("ENABLE_UTILS")
157163
enable_bitcoind = config["components"].getboolean("ENABLE_BITCOIND")
@@ -233,7 +239,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
233239
if enable_coverage:
234240
coverage = RPCCoverage()
235241
flags.append(coverage.flag)
236-
print("Initializing coverage directory at %s\n" % coverage.dir)
242+
logging.debug("Initializing coverage directory at %s" % coverage.dir)
237243
else:
238244
coverage = None
239245

@@ -249,16 +255,20 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
249255
job_queue = TestHandler(jobs, tests_dir, test_list, flags)
250256

251257
max_len_name = len(max(test_list, key=len))
252-
results = BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "STATUS ", "DURATION") + BOLD[0]
258+
results = "\n" + BOLD[1] + "%s | %s | %s\n\n" % ("TEST".ljust(max_len_name), "STATUS ", "DURATION") + BOLD[0]
253259
for _ in range(len(test_list)):
254260
(name, stdout, stderr, status, duration) = job_queue.get_next()
255261
all_passed = all_passed and status != "Failed"
256262
time_sum += duration
257263

258-
print('\n' + BOLD[1] + name + BOLD[0] + ":")
259-
print('' if status == "Passed" else stdout + '\n', end='')
260-
print('' if stderr == '' else 'stderr:\n' + stderr + '\n', end='')
261-
print("Status: %s%s%s, Duration: %s s\n" % (BOLD[1], status, BOLD[0], duration))
264+
if status == "Passed":
265+
logging.debug("\n%s%s%s passed, Duration: %s s" % (BOLD[1], name, BOLD[0], duration))
266+
elif status == "Skipped":
267+
logging.debug("\n%s%s%s skipped" % (BOLD[1], name, BOLD[0]))
268+
else:
269+
print("\n%s%s%s failed, Duration: %s s\n" % (BOLD[1], name, BOLD[0], duration))
270+
print(BOLD[1] + 'stdout:\n' + BOLD[0] + stdout + '\n')
271+
print(BOLD[1] + 'stderr:\n' + BOLD[0] + stderr + '\n')
262272

263273
results += "%s | %s | %s s\n" % (name.ljust(max_len_name), status.ljust(7), duration)
264274

@@ -269,7 +279,7 @@ def run_tests(test_list, src_dir, build_dir, exeext, jobs=1, enable_coverage=Fal
269279
if coverage:
270280
coverage.report_rpc_coverage()
271281

272-
print("Cleaning up coverage data")
282+
logging.debug("Cleaning up coverage data")
273283
coverage.cleanup()
274284

275285
sys.exit(not all_passed)

0 commit comments

Comments
 (0)