diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-07 06:30:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 06:30:57 -0500 |
| commit | be3858bcf1a666e374713a43892b8d7ec10c9c8b (patch) | |
| tree | d41ea80dab5b9e7915b7aa876603b82b10388b69 /Makefile | |
| parent | 87d911aca97a824728e499c8590e20e8528e24d5 (diff) | |
| parent | dca2e7924ba5346eb78a3b7091d15b316e4e925a (diff) | |
| download | podman-be3858bcf1a666e374713a43892b8d7ec10c9c8b.tar.gz podman-be3858bcf1a666e374713a43892b8d7ec10c9c8b.tar.bz2 podman-be3858bcf1a666e374713a43892b8d7ec10c9c8b.zip | |
Merge pull request #13406 from jwhonce/wip/docker-py
Move all python tests to pytest
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -542,7 +542,7 @@ validate.completions: run-docker-py-tests: touch test/__init__.py env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf pytest --disable-warnings test/python/docker/ - -rm test/__init__.py + rm -f test/__init__.py .PHONY: localunit localunit: test/goecho/goecho test/version/version @@ -623,9 +623,15 @@ remotesystem: .PHONY: localapiv2 localapiv2: - env PODMAN=./bin/podman ./test/apiv2/test-apiv2 - env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman ${PYTHON} -m unittest discover -v ./test/apiv2/python - env CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman ${PYTHON} -m unittest discover -v ./test/python/docker + # 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 CONTAINERS_CONF=$(CURDIR)/test/apiv2/containers.conf PODMAN=./bin/podman \ + pytest --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 + rm -f test/__init__.py .PHONY: remoteapiv2 remoteapiv2: @@ -949,5 +955,5 @@ clean: clean-binaries ## Clean all make artifacts libpod/pod_easyjson.go \ .install.goimports \ docs/build \ - venv + .venv make -C docs clean |