summaryrefslogtreecommitdiff
path: root/test/apiv2/22-stop.at
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-03-08 15:32:26 -0700
committerEd Santiago <santiago@redhat.com>2021-03-10 05:24:44 -0700
commit258749e43dc8c2e842f96f8672823b0fa4e5a147 (patch)
tree672f13c9d214589833dce044b5982cba74c4abc0 /test/apiv2/22-stop.at
parent5331096b3882cd5c8e587200560e44ef1eb990a3 (diff)
downloadpodman-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/22-stop.at')
-rw-r--r--test/apiv2/22-stop.at16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/apiv2/22-stop.at b/test/apiv2/22-stop.at
index 11318ca81..91bc9937d 100644
--- a/test/apiv2/22-stop.at
+++ b/test/apiv2/22-stop.at
@@ -8,17 +8,17 @@ podman pull $IMAGE &>/dev/null
# stop, by name
podman run -dt --name mytop $IMAGE top &>/dev/null
-t GET libpod/containers/mytop/json 200 .State.Status=running
-t POST libpod/containers/mytop/stop "" 204
-t GET libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
-t DELETE libpod/containers/mytop 204
+t GET libpod/containers/mytop/json 200 .State.Status=running
+t POST libpod/containers/mytop/stop 204
+t GET libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
+t DELETE libpod/containers/mytop 204
# stop, by ID
# Remember that podman() hides all output; we need to get our CID via inspect
podman run -dt --name mytop $IMAGE top
-t GET libpod/containers/mytop/json 200 .State.Status=running
+t GET libpod/containers/mytop/json 200 .State.Status=running
cid=$(jq -r .Id <<<"$output")
-t POST libpod/containers/$cid/stop "" 204
-t GET libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
-t DELETE libpod/containers/mytop 204
+t POST libpod/containers/$cid/stop 204
+t GET libpod/containers/mytop/json 200 .State.Status~\\\(exited\\\|stopped\\\)
+t DELETE libpod/containers/mytop 204