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

Merge pull request #23562 from cevich/rm_docker_py_dupe

Browse Source 
De-duplicate docker-py testing
This commit is contained in:
openshift-merge-bot[bot]
2024-08-12 12:05:41 +00:00
committed by GitHub
parent 277e061878 dcdb5408de
commit 52fe111b51
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -723,10 +723,6 @@ localapiv2-bash:
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 --verbose --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 --verbose --disable-warnings ./test/python/docker
rm -f test/__init__.py
# Order is important running python tests first causes the bash tests # Order is important running python tests first causes the bash tests
# to fail, see 12-imagesMore. FIXME order of tests should not matter # to fail, see 12-imagesMore. FIXME order of tests should not matter

1
contrib/cirrus/setup_environment.sh
View File

@ -393,7 +393,6 @@ case "$TEST_FLAVOR" in
;& # Continue with next item ;& # Continue with next item
apiv2) apiv2)
msg "Installing previously downloaded/cached packages" msg "Installing previously downloaded/cached packages"
showrun dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm
virtualenv .venv/requests virtualenv .venv/requests
source .venv/requests/bin/activate source .venv/requests/bin/activate
showrun pip install --upgrade pip showrun pip install --upgrade pip

8
test/python/requirements.txt
View File

@ -1,8 +0,0 @@
docker~=6.1.0
requests-mock~=1.12.1
requests~=2.32.3
setuptools~=72.1.0
python-dateutil~=2.9.0
PyYAML~=6.0.0
openapi-schema-validator~=0.6.2
pytest==8.1.2

1
test/python/requirements.txt Symbolic link
View File

@ -0,0 +1 @@
../apiv2/python/requirements.txt