summaryrefslogtreecommitdiff
path: root/test/apiv2/30-volumes.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/30-volumes.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/30-volumes.at')
-rw-r--r--test/apiv2/30-volumes.at47
1 files changed, 28 insertions, 19 deletions
diff --git a/test/apiv2/30-volumes.at b/test/apiv2/30-volumes.at
index cf4b3d3ea..c27c638bb 100644
--- a/test/apiv2/30-volumes.at
+++ b/test/apiv2/30-volumes.at
@@ -13,25 +13,34 @@ t POST libpod/volumes/create name=foo1 201 \
.CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
.Labels={} \
.Options={}
-t POST libpod/volumes/create '' 201
+t POST libpod/volumes/create 201
t POST libpod/volumes/create \
- '"Name":"foo2","Label":{"testlabel":"testonly"},"Options":{"type":"tmpfs","o":"nodev,noexec"}}' 201 \
- .Name=foo2 \
- .Labels.testlabel=testonly \
- .Options.type=tmpfs \
- .Options.o=nodev,noexec
+ Name=foo2 \
+ Label='{"testlabel":"testonly"}' \
+ Options='{"type":"tmpfs","o":"nodev,noexec"}}' \
+ 201 \
+ .Name=foo2 \
+ .Labels.testlabel=testonly \
+ .Options.type=tmpfs \
+ .Options.o=nodev,noexec
t POST libpod/volumes/create \
- '"Name":"foo3","Label":{"testlabel":""},"Options":{"type":"tmpfs","o":"nodev,noexec"}}' 201 \
- .Name=foo3 \
- .Labels.testlabel="" \
- .Options.type=tmpfs \
- .Options.o=nodev,noexec
+ Name=foo3 \
+ Label='{"testlabel":""}' \
+ Options='{"type":"tmpfs","o":"nodev,noexec"}}' \
+ 201 \
+ .Name=foo3 \
+ .Labels.testlabel="" \
+ .Options.type=tmpfs \
+ .Options.o=nodev,noexec
t POST libpod/volumes/create \
- '"Name":"foo4","Label":{"testlabel1":"testonly"},"Options":{"type":"tmpfs","o":"nodev,noexec"}}' 201 \
- .Name=foo4 \
- .Labels.testlabel1=testonly \
- .Options.type=tmpfs \
- .Options.o=nodev,noexec
+ Name=foo4 \
+ Label='{"testlabel1":"testonly"}' \
+ Options='{"type":"tmpfs","o":"nodev,noexec"}}' \
+ 201 \
+ .Name=foo4 \
+ .Labels.testlabel1=testonly \
+ .Options.type=tmpfs \
+ .Options.o=nodev,noexec
# Negative test
# We have created a volume named "foo1"
@@ -78,15 +87,15 @@ t DELETE libpod/volumes/foo1 404 \
.response=404
## Prune volumes with label matching 'testlabel1=testonly'
-t POST libpod/volumes/prune?filters='{"label":["testlabel1=testonly"]}' "" 200
+t POST libpod/volumes/prune?filters='{"label":["testlabel1=testonly"]}' 200
t GET libpod/volumes/json?filters='{"label":["testlabel1=testonly"]}' 200 length=0
## Prune volumes with label matching 'testlabel'
-t POST libpod/volumes/prune?filters='{"label":["testlabel"]}' "" 200
+t POST libpod/volumes/prune?filters='{"label":["testlabel"]}' 200
t GET libpod/volumes/json?filters='{"label":["testlabel"]}' 200 length=0
## Prune volumes
-t POST libpod/volumes/prune "" 200
+t POST libpod/volumes/prune 200
#After prune volumes, there should be no volume existing
t GET libpod/volumes/json 200 length=0