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

Merge pull request #6978 from edsantiago/apiv2_flake_fix

Browse Source 
APIv2 tests: fix race condition causing CI flake
This commit is contained in:
OpenShift Merge Robot
2020-07-15 06:03:03 -04:00
committed by GitHub
parent 4250d24299 d3f9f09892
commit 4138cc9167
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,17 +51,19 @@ cid=$(jq -r '.[0].Id' <<<"$output")
t DELETE libpod/containers/$cid 204 t DELETE libpod/containers/$cid 204
# Ensure that API does not occur: Create Container creates an invalid and the container fails to start # Issue #6799: it should be possible to start a container, even w/o args.
# https://github.com/containers/libpod/issues/6799 t POST libpod/containers/create?name=test_noargs Image=${IMAGE} 201 \
CNAME=testArgs
t POST libpod/containers/create?name=${CNAME} Image=${IMAGE} 201 \
.Id~[0-9a-f]\\{64\\} .Id~[0-9a-f]\\{64\\}
t GET libpod/containers/json?limit=1 200 \ cid=$(jq -r '.Id' <<<"$output")
length=1 \ # Prior to the fix in #6835, this would fail 500 "args must not be empty"
.[0].Id~[0-9a-f]\\{64\\}
cid=$(jq -r '.[0].Id' <<<"$output")
# This step should start the container properly
t POST libpod/containers/${cid}/start '' 204 t POST libpod/containers/${cid}/start '' 204
# Container should exit almost immediately. Wait for it, confirm successful run
t POST libpod/containers/${cid}/wait '' 200 '0'
t GET libpod/containers/${cid}/json 200 \
.Id=$cid \
.State.Status~\\\(exited\\\|stopped\\\) \
.State.Running=false \
.State.ExitCode=0
t DELETE libpod/containers/$cid 204 t DELETE libpod/containers/$cid 204
CNAME=myfoo CNAME=myfoo
@ -75,7 +77,8 @@ t POST "libpod/commit?container=nonesuch" '' 404
# Comment can only be used with docker format, not OCI # Comment can only be used with docker format, not OCI
cparam="repo=newrepo&comment=foo&author=bob" cparam="repo=newrepo&comment=foo&author=bob"
t POST "libpod/commit?container=$CNAME&$cparam" '' 500 t POST "libpod/commit?container=$CNAME&$cparam" '' 500 \
.cause="messages are only compatible with the docker image format (-f docker)"
# Commit a new image from the container # Commit a new image from the container
t POST "libpod/commit?container=$CNAME" '' 200 \ t POST "libpod/commit?container=$CNAME" '' 200 \