diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-03-08 15:32:26 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-03-10 05:24:44 -0700 |
| commit | 258749e43dc8c2e842f96f8672823b0fa4e5a147 (patch) | |
| tree | 672f13c9d214589833dce044b5982cba74c4abc0 /test/apiv2/10-images.at | |
| parent | 5331096b3882cd5c8e587200560e44ef1eb990a3 (diff) | |
| download | podman-258749e43dc8c2e842f96f8672823b0fa4e5a147.tar.gz podman-258749e43dc8c2e842f96f8672823b0fa4e5a147.tar.bz2 podman-258749e43dc8c2e842f96f8672823b0fa4e5a147.zip | |
apiv2 tests: finally fix POST as originally intended
When I originally wrote this code I had no idea what POST
would look like so I did a sloppy job, deferring making it
usable. Now that we have some real-world examples in place,
I have a better understanding of what params look like and
how to make tests more readable/maintainable. (Deferring isn't
always bad: one of my early ideas was to separate params using
commas; that would've been a disaster because some JSON values,
such as arrays, include commas).
This commit implements a better way of dealing with POST:
* The main concept is still 'key=value'
* When value is a JSON object (dictionary, array), it
can be quoted.
* Multiple params are simply separated by spaces.
The 3-digit HTTP code is a prominent, readable separator
between POST params and expected results. The parsing
code is a little uglier, but test developers need
never see that. The important thing is that writing
tests is now easier.
* POST params can be empty (this removes the need for a
useless '')
I snuck in one unrelated change: one of the newly-added
tests, .NetworkSettings, was failing when run rootless
(which is how I test on my setup). I made it conditional.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/apiv2/10-images.at')
| -rw-r--r-- | test/apiv2/10-images.at | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at index f866422e2..4ebaeff45 100644 --- a/test/apiv2/10-images.at +++ b/test/apiv2/10-images.at @@ -41,18 +41,18 @@ t GET images/$iid/json 200 \ .Id=sha256:$iid \ .RepoTags[0]=$IMAGE -t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*Download complete.*" +t POST "images/create?fromImage=alpine" 200 .error~null .status~".*Download complete.*" -t POST "images/create?fromImage=alpine&tag=latest" '' 200 +t POST "images/create?fromImage=alpine&tag=latest" 200 # Make sure that new images are pulled old_iid=$(podman image inspect --format "{{.ID}}" docker.io/library/alpine:latest) podman rmi -f docker.io/library/alpine:latest podman tag $IMAGE docker.io/library/alpine:latest -t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*$old_iid.*" +t POST "images/create?fromImage=alpine" 200 .error~null .status~".*$old_iid.*" podman untag $IMAGE docker.io/library/alpine:latest -t POST "images/create?fromImage=quay.io/libpod/alpine&tag=sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" '' 200 +t POST "images/create?fromImage=quay.io/libpod/alpine&tag=sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" 200 # Display the image history t GET libpod/images/nonesuch/history 404 |