From cafb76b635e4ef6dc279f65f47f64b3967172641 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 6 Apr 2022 17:03:46 -0400 Subject: Increase verbosity and sequencing of APIv2 testing The default verbosity level does not show the classes or function names. This makes it difficult to debug problems like hangs. Also, separate the bats and python-based tests into two sections. This allows for easier debugging, since isolation can be done in `runner.sh` rather than mucking with the `Makefile`. Lastly, update the logformatter script to `autoflush stdout` (thanks @edsantiago). Signed-off-by: Chris Evich --- Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 502323906..982d7b1e5 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3-54-g00ecf