Merge branch 'pr/79'

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

Author: jk-ozlabs

meson.build

@@ -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')
 
@@ -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

tests/requirements.txt

@@ -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