Skip to content

QOL changes for test runner #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,13 @@ if tests
# Invoke pytest via a shell script under `dbus-run-session` so we can
# override the sanitation of `DBUS_STARTER_BUS_TYPE`, ensuring `test-mctpd`
# connects to the isolated session bus prepared by `dbus-run-session`.
#
# On newer meson versions, we can use meson test -C build --interactive
# to allow pytest to print output directly onto the terminal without
# redirecting to a file. We can detect this if stdout is an terminal, and
# disable TAP protocol.
pytest = find_program('pytest')
script = 'export DBUS_STARTER_BUS_TYPE=user ; @0@ --tap'.format(pytest.full_path())
script = '''export DBUS_STARTER_BUS_TYPE=user; if [ ! -t 1 ]; then PYTEST_FLAGS="--tap"; fi; @0@ $PYTEST_FLAGS $@'''.format(pytest.full_path())
sh = find_program('sh')
dbus_run_session = find_program('dbus-run-session')

Expand All @@ -135,7 +140,7 @@ if tests

test('test-mctpd', dbus_run_session,
depends: mctpd_test,
args: [ sh.full_path(), '-c', script ],
args: [ sh.full_path(), '-c', script, '--' ],
protocol: 'tap',
)
endif
2 changes: 1 addition & 1 deletion tests/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ pyroute2==0.7.10
pytest==8.3.2
pytest-trio==0.8.0
trio==0.26.2
pytest-tap==3.4
pytest-tap==3.5