From 258749e43dc8c2e842f96f8672823b0fa4e5a147 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Mon, 8 Mar 2021 15:32:26 -0700 Subject: 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 --- test/apiv2/25-containersMore.at | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/apiv2/25-containersMore.at') diff --git a/test/apiv2/25-containersMore.at b/test/apiv2/25-containersMore.at index b88c798eb..39bfa2e32 100644 --- a/test/apiv2/25-containersMore.at +++ b/test/apiv2/25-containersMore.at @@ -17,7 +17,7 @@ t GET libpod/containers/nonesuch/exists 404 t GET libpod/containers/foo/exists 204 # Pause the container -t POST libpod/containers/foo/pause '' 204 +t POST libpod/containers/foo/pause 204 t GET libpod/containers/foo/json 200 \ .Id~[0-9a-f]\\{64\\} \ @@ -27,7 +27,7 @@ t GET libpod/containers/foo/json 200 \ .Name=foo # Unpause the container -t POST libpod/containers/foo/unpause '' 204 +t POST libpod/containers/foo/unpause 204 t GET libpod/containers/foo/json 200 \ .Id~[0-9a-f]\\{64\\} \ @@ -44,11 +44,11 @@ t GET libpod/containers/foo/top 200 \ t GET libpod/containers/nonesuch/top 404 # Mount the container to host filesystem -t POST libpod/containers/foo/mount '' 200 +t POST libpod/containers/foo/mount 200 like "$output" ".*merged" "Check container mount" # Unmount the container -t POST libpod/containers/foo/unmount '' 204 +t POST libpod/containers/foo/unmount 204 t DELETE libpod/containers/foo?force=true 204 @@ -85,7 +85,7 @@ podman run $IMAGE true podman run $IMAGE true podman run $IMAGE true -t POST libpod/containers/prune '' 200 +t POST libpod/containers/prune 200 t GET libpod/containers/json 200 \ length=0 # vim: filetype=sh -- cgit v1.2.3-54-g00ecf