diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-08-25 08:23:14 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-08-25 11:07:11 -0600 |
| commit | e634470fae851325661f6dc1d714872cc567d306 (patch) | |
| tree | eca8a146e10f38142bfcbb74e16449d8eb409112 /test/apiv2/40-pods.at | |
| parent | f98215c668746e9a7b9603448428cd1301a56eac (diff) | |
| download | podman-e634470fae851325661f6dc1d714872cc567d306.tar.gz podman-e634470fae851325661f6dc1d714872cc567d306.tar.bz2 podman-e634470fae851325661f6dc1d714872cc567d306.zip | |
APIv2 test cleanup, part 2 of 2
This finishes the removal of curls and exits.
Please please please, everyone, if you see a 'curl' or 'exit'
in any new PR, reject the PR and tell me immediately so I can
help the developer do it the proper way.
Also, removed some very-very-wrong USER/UID code. Both are
reserved variables in bash. You cannot override them.
Also, added a cleanup to a system-connection test. I wasted
a lot of time because my podman-remote stopped working, all
because I had run this test as part of something unrelated.
Also, found and fixed dangerously-broken timeout code.
Implemented a new mechanism for requiring a timeout.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/apiv2/40-pods.at')
| -rw-r--r-- | test/apiv2/40-pods.at | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/test/apiv2/40-pods.at b/test/apiv2/40-pods.at index d21b3d1a9..0e0f1cb18 100644 --- a/test/apiv2/40-pods.at +++ b/test/apiv2/40-pods.at @@ -134,23 +134,17 @@ t GET libpod/pods/json?filters='{"label":["testl' 400 \ t DELETE libpod/pods/foo 200 t DELETE "libpod/pods/foo (pod has already been deleted)" 404 -t_timeout 5 GET "libpod/pods/stats?stream=true&delay=1" 200 +# Expect this to time out +APIV2_TEST_EXPECT_TIMEOUT=5 t GET "libpod/pods/stats?stream=true&delay=1" 999 podman pod create --name=specgen TMPD=$(mktemp -d podman-apiv2-test.build.XXXXXXXX) -podman generate spec -f ${TMPD}/input.txt -c specgen +podman generate spec -f ${TMPD}/myspec.json -c specgen -curl -XPOST -o ${TMPD}/response.txt --dump-header ${TMPD}/headers.txt -H content-type:application/json http://$HOST:$PORT/v4.0.0/libpod/pods/create -d "@${TMPD}/input.txt" - -if ! grep -q '201 Created' "${TMPD}/headers.txt"; then - cat "${TMPD}/headers.txt" - cat "${TMPD}/response.txt" - echo -e "${red}NOK: pod create failed" - rm -rf $TMPD - exit 1 -fi +t POST libpod/pods/create ${TMPD}/myspec.json 201 \ + .Id~[0-9a-f]\\{64\\} rm -rf $TMPD |