diff options
| -rw-r--r-- | Makefile | 18 | ||||
| -rwxr-xr-x | contrib/cirrus/logformatter | 3 | ||||
| -rwxr-xr-x | contrib/cirrus/runner.sh | 7 |
3 files changed, 20 insertions, 8 deletions
@@ -616,18 +616,24 @@ remotesystem: fi;\ exit $$rc -.PHONY: localapiv2 -localapiv2: - # Order is important running python tests first causes the bash tests to fail, see 12-imagesMore - # FIXME order of tests should not matter +.PHONY: localapiv2-bash +localapiv2-bash: env PODMAN=./bin/podman stdbuf -o0 -e0 ./test/apiv2/test-apiv2 + +.PHONY: localapiv2-python +localapiv2-python: env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \ - pytest --disable-warnings ./test/apiv2/python + pytest --verbose --disable-warnings ./test/apiv2/python touch test/__init__.py env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \ - pytest --disable-warnings ./test/python/docker + pytest --verbose --disable-warnings ./test/python/docker rm -f test/__init__.py +# Order is important running python tests first causes the bash tests +# to fail, see 12-imagesMore. FIXME order of tests should not matter +.PHONY: localapiv2 +localapiv2: localapiv2-bash localapiv2-python + .PHONY: remoteapiv2 remoteapiv2: true diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 3c52e612b..05f05dc0b 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -20,6 +20,9 @@ use warnings; our $VERSION = '0.1'; +# Autoflush stdout +$| = 1; + # For debugging, show data structures using DumpTree($var) #use Data::TreeDumper; $Data::TreeDumper::Displayaddress = 0; diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 8f956d7f5..aee9bcfbb 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -59,8 +59,11 @@ function _run_unit() { function _run_apiv2() { _bail_if_test_can_be_skipped test/apiv2 - source .venv/requests/bin/activate - make localapiv2 |& logformatter + ( + make localapiv2-bash + source .venv/requests/bin/activate + make localapiv2-python + ) |& logformatter } function _run_compose() { |