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 /contrib | |
| 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 'contrib')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 15 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 13 |
2 files changed, 14 insertions, 14 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 3aa69183e..d1d87ad04 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -55,11 +55,8 @@ function _run_unit() { } function _run_apiv2() { - local m="Testing of API was performed using the **PODMAN*** client" - warn "$m" - if ! make localapiv2 |& logformatter; then - die "$m" - fi + source .venv/requests/bin/activate + make localapiv2 |& logformatter } function _run_compose() { @@ -100,12 +97,8 @@ function _run_bindings() { } function _run_docker-py() { - m="Testing of API was performed using the **DOCKER** client" - warn "$m" - source venv/bin/activate - if ! make run-docker-py-tests; then - die "$m" - fi + source .venv/docker-py/bin/activate + make run-docker-py-tests } function _run_endpoint() { diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 93f085983..696560166 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -265,14 +265,21 @@ case "$TEST_FLAVOR" in msg "Installing previously downloaded/cached packages" dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm - virtualenv venv - source venv/bin/activate + virtualenv .venv/docker-py + source .venv/docker-py/bin/activate pip install --upgrade pip pip install --requirement $GOSRC/test/python/requirements.txt ;; build) make clean ;; unit) ;; - apiv2) ;& # use next item + apiv2) + msg "Installing previously downloaded/cached packages" + dnf install -y $PACKAGE_DOWNLOAD_DIR/python3*.rpm + virtualenv .venv/requests + source .venv/requests/bin/activate + pip install --upgrade pip + pip install --requirement $GOSRC/test/apiv2/python/requirements.txt + ;& # continue with next item compose) rpm -ivh $PACKAGE_DOWNLOAD_DIR/podman-docker* ;& # continue with next item |