diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:22:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:22:26 -0400 |
| commit | 31231ffd748d10048e6541b18fd863a66342c6c7 (patch) | |
| tree | e6d32a8ed6bb3328194f4c53d3967343f4d9d39a /Makefile | |
| parent | 1a768dbc089c91dda7f552cb89134be9fa498136 (diff) | |
| parent | ad249222d254fec0be84b474906651936b89578b (diff) | |
| download | podman-31231ffd748d10048e6541b18fd863a66342c6c7.tar.gz podman-31231ffd748d10048e6541b18fd863a66342c6c7.tar.bz2 podman-31231ffd748d10048e6541b18fd863a66342c6c7.zip | |
Merge pull request #13959 from cevich/fix_apiv2
Fix hang in apiv2 test_connect
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 12 insertions, 6 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 |