diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-10 09:09:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 09:09:56 -0500 |
| commit | 64a73686b988c18932a49ba633082b147ce48bfd (patch) | |
| tree | 466c10176b4075d2c93d7c29a851ad8d393dddb1 /test/apiv2 | |
| parent | 0585aaa1f17de1cacc7924926e81733cc027a86f (diff) | |
| parent | c4676c571910d8b27ead751e35cbd877db61f8bd (diff) | |
| download | podman-64a73686b988c18932a49ba633082b147ce48bfd.tar.gz podman-64a73686b988c18932a49ba633082b147ce48bfd.tar.bz2 podman-64a73686b988c18932a49ba633082b147ce48bfd.zip | |
Merge pull request #13189 from jwhonce/wip/network_version
Add version guard to libpod API endpoints
Diffstat (limited to 'test/apiv2')
| -rw-r--r-- | test/apiv2/35-networks.at | 5 | ||||
| -rwxr-xr-x | test/apiv2/test-apiv2 | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/apiv2/35-networks.at b/test/apiv2/35-networks.at index 0e2389bd5..3502b89e0 100644 --- a/test/apiv2/35-networks.at +++ b/test/apiv2/35-networks.at @@ -8,7 +8,10 @@ t GET networks/non-existing-network 404 \ t POST libpod/networks/create name='"network1"' 200 \ .name=network1 \ - .created~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \ + .created~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* + +t POST /v3.4.0/libpod/networks/create name='"bad_version"' 400 \ + .cause='given version is not supported' # --data '{"name":"network2","subnets":[{"subnet":"10.10.254.0/24"}],"Labels":{"abc":"val"}}' t POST libpod/networks/create name='"network2"' \ diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 56280f04e..bd728e130 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -256,11 +256,11 @@ function t() { # If given path begins with /, use it as-is; otherwise prepend /version/ local url=http://$HOST:$PORT - if expr "$path" : "/" >/dev/null; then - url="$url$path" - else - url="$url/v1.40/$path" - fi + case "$path" in + /*) url="$url$path" ;; + libpod/*) url="$url/v4.0.0/$path" ;; + *) url="$url/v1.41/$path" ;; + esac # Log every action we do echo "-------------------------------------------------------------" >>$LOG |