From 75dfb7b6499bf51d3fd8aba617fdd5bbf2a3f7c9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 12 Oct 2024 23:56:38 +0200 Subject: [PATCH] pytest: include `buildinfo.txt` in the output If present. It aims to provide TextClutch the same build information that `runtests.pl` already is providing. Ref: https://testclutch.curl.se/static/reports/feature-matrix.html Ref: #15256 Follow-up to 1fdea1684602a1ae2870c67b5f3e8fd34f63da95 #14802 Closes #15279 --- tests/http/conftest.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/http/conftest.py b/tests/http/conftest.py index 948d4204df..d3f655263d 100644 --- a/tests/http/conftest.py +++ b/tests/http/conftest.py @@ -53,6 +53,13 @@ def pytest_report_header(config): report.extend([ f' VsFTPD: {env.vsftpd_version()}, ftp:{env.ftp_port}, ftps:{env.ftps_port}' ]) + buildinfo_fn = os.path.join(env.build_dir, 'buildinfo.txt') + if os.path.exists(buildinfo_fn): + with open(buildinfo_fn, 'r') as file_in: + for line in file_in: + line = line.strip() + if line and not line.startswith('#'): + report.extend([line]) return '\n'.join(report) # TODO: remove this and repeat argument everywhere, pytest-repeat can be used to repeat tests -- 2.47.3