opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increase verbosity and sequencing of APIv2 testing

Browse Source 
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 <cevich@redhat.com>
This commit is contained in:
Chris Evich
2022-04-06 17:03:46 -04:00
parent 1a768dbc08
commit cafb76b635
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -616,18 +616,24 @@ remotesystem:
fi;\ fi;\
exit $$rc exit $$rc
.PHONY: localapiv2 .PHONY: localapiv2-bash
localapiv2: localapiv2-bash:
# Order is important running python tests first causes the bash tests to fail, see 12-imagesMore
# FIXME order of tests should not matter
env PODMAN=./bin/podman stdbuf -o0 -e0 ./test/apiv2/test-apiv2 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 \ 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 touch test/__init__.py
env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \ 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 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 .PHONY: remoteapiv2
remoteapiv2: remoteapiv2:
true true

3
contrib/cirrus/logformatter
View File

@ -20,6 +20,9 @@ use warnings;
our $VERSION = '0.1'; our $VERSION = '0.1';
# Autoflush stdout
$| = 1;
# For debugging, show data structures using DumpTree($var) # For debugging, show data structures using DumpTree($var)
#use Data::TreeDumper; $Data::TreeDumper::Displayaddress = 0; #use Data::TreeDumper; $Data::TreeDumper::Displayaddress = 0;

5
contrib/cirrus/runner.sh
View File

@ -59,8 +59,11 @@ function _run_unit() {
function _run_apiv2() { function _run_apiv2() {
_bail_if_test_can_be_skipped test/apiv2 _bail_if_test_can_be_skipped test/apiv2
(
make localapiv2-bash
source .venv/requests/bin/activate source .venv/requests/bin/activate
make localapiv2 |& logformatter make localapiv2-python
) |& logformatter
} }
function _run_compose() { function _run_compose() {