opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10662 from mwhahaha/fix-apiv2-tests

Browse Source 
Fix broken volume and container tests
This commit is contained in:
OpenShift Merge Robot
2021-07-14 13:42:58 -04:00
committed by GitHub
parent ace19c75ad 6ced24d0b6
commit 9570bf6b30
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/apiv2/20-containers.at
View File

@ -211,15 +211,11 @@ t GET containers/$cid/json 200 \
t POST containers/create Image=$IMAGE Entrypoint='["top"]' 201 \
.Id~[0-9a-f]\\{64\\}
cid_top=$(jq -r '.Id' <<<"$output")
network_expect="{}"
if root; then
network_expect='.podman.NetworkID=podman'
fi
t GET containers/${cid_top}/json 200 \
.Config.Entrypoint[0]="top" \
.Config.Cmd='[]' \
.Path="top"
.NetworkSettings.Networks="$network_expect"
.Path="top" \
.NetworkSettings.Networks.podman.NetworkID=podman
t POST containers/${cid_top}/start 204
# make sure the container is running
t GET containers/${cid_top}/json 200 \

7
test/apiv2/30-volumes.at
View File

@ -13,13 +13,14 @@ t POST libpod/volumes/create name=foo1 201 \
.CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
.Labels={} \
.Options={}
# TODO(mwhahaha): there might be a bug here since options is null and not {}
t POST volumes/create 201 \
.Name~[0-9a-f]\\{64\\}
.Name~[0-9a-f]\\{64\\} \
.Driver=local \
.Mountpoint=$volumepath/~[0-9a-f]\\{64\\}/_data \
.Mountpoint~$volumepath/[0-9a-f]\\{64\\}/_data \
.CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
.Labels={} \
.Options={}
.Options=null
t POST libpod/volumes/create 201
t POST libpod/volumes/create \
Name=foo2 \