diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-16 15:04:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-16 15:04:54 +0000 |
| commit | 26b1dddda7aca89e57608ea232e84a1802591562 (patch) | |
| tree | 52a79d694324e0b48d60e12444901e6ef0baf706 /Makefile | |
| parent | 41fb06a251f5639a1347b15f2e3ecdca54efa664 (diff) | |
| parent | 27443660ce0f5f7365adc0f5fab98d4831cdd6ef (diff) | |
| download | podman-26b1dddda7aca89e57608ea232e84a1802591562.tar.gz podman-26b1dddda7aca89e57608ea232e84a1802591562.tar.bz2 podman-26b1dddda7aca89e57608ea232e84a1802591562.zip | |
Merge pull request #11169 from cevich/enable_docker_py_testing
Enable docker-py compat. testing w/ ignored result
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -493,10 +493,12 @@ validate.completions: if [ -x /bin/zsh ]; then /bin/zsh completions/zsh/_podman; fi if [ -x /bin/fish ]; then /bin/fish completions/fish/podman.fish; fi +# Note: Assumes test/python/requirements.txt is installed & available .PHONY: run-docker-py-tests run-docker-py-tests: - $(eval testLogs=$(shell mktemp podman_tmp_XXXX)) - ./bin/podman run --rm --security-opt label=disable --privileged -v $(testLogs):/testLogs --net=host -e DOCKER_HOST=tcp://localhost:8080 $(DOCKERPY_IMAGE) sh -c "pytest $(DOCKERPY_TEST) " + touch test/__init__.py + pytest test/python/docker/ + -rm test/__init__.py .PHONY: localunit localunit: test/goecho/goecho @@ -841,11 +843,13 @@ clean: ## Clean all make artifacts build \ test/checkseccomp/checkseccomp \ test/goecho/goecho \ + test/__init__.py \ test/testdata/redis-image \ libpod/container_ffjson.go \ libpod/pod_ffjson.go \ libpod/container_easyjson.go \ libpod/pod_easyjson.go \ .install.goimports \ - docs/build + docs/build \ + venv make -C docs clean |