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/26-containersWait.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/26-containersWait.at')
| -rw-r--r-- | test/apiv2/26-containersWait.at | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/apiv2/26-containersWait.at b/test/apiv2/26-containersWait.at index 3f530c3f0..6a628e55a 100644 --- a/test/apiv2/26-containersWait.at +++ b/test/apiv2/26-containersWait.at @@ -13,15 +13,15 @@ podman rm -a -f &>/dev/null CTR="WaitTestingCtr" -t POST "containers/nonExistent/wait?condition=next-exit" '' 404 +t POST "containers/nonExistent/wait?condition=next-exit" 404 podman create --name "${CTR}" --entrypoint '["sleep", "0.5"]' "${IMAGE}" -t POST "containers/${CTR}/wait?condition=non-existent-cond" '' 400 +t POST "containers/${CTR}/wait?condition=non-existent-cond" 400 -t POST "containers/${CTR}/wait?condition=not-running" '' 200 +t POST "containers/${CTR}/wait?condition=not-running" 200 -t POST "containers/${CTR}/wait?condition=next-exit" '' 200 & +t POST "containers/${CTR}/wait?condition=next-exit" 200 & child_pid=$! podman start "${CTR}" wait "${child_pid}" @@ -37,7 +37,7 @@ if kill -2 "${child_pid}" 2> "/dev/null"; then WAIT_TEST_ERROR="1" fi -t POST "containers/${CTR}/wait?condition=removed" '' 200 & +t POST "containers/${CTR}/wait?condition=removed" 200 & child_pid=$! podman container rm "${CTR}" wait "${child_pid}" |