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>

1 files changed, 20 insertions, 14 deletions

diff --git a/test/apiv2/45-system.at b/test/apiv2/45-system.at
index ad4bdf4f7..364b87c56 100644
--- a/test/apiv2/45-system.at
+++ b/test/apiv2/45-system.at
@@ -27,22 +27,28 @@ t GET libpod/system/df 200 '.Volumes[0].VolumeName=foo1'
 
 # Create two more volumes to test pruneing
 t POST libpod/volumes/create \
-    '"Name":"foo2","Label":{"testlabel1":""},"Options":{"type":"tmpfs","o":"nodev,noexec"}}' 201 \
-    .Name=foo2 \
-    .Driver=local \
-    .Mountpoint=$volumepath/foo2/_data \
-    .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
-    .Labels.testlabel1="" \
-    .Options.o=nodev,noexec
+  Name=foo2 \
+  Label='{"testlabel1":""}' \
+  Options='{"type":"tmpfs","o":"nodev,noexec"}}' \
+  201 \
+  .Name=foo2 \
+  .Driver=local \
+  .Mountpoint=$volumepath/foo2/_data \
+  .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
+  .Labels.testlabel1="" \
+  .Options.o=nodev,noexec
 
 t POST libpod/volumes/create \
-    '"Name":"foo3","Label":{"testlabel1":"testonly"},"Options":{"type":"tmpfs","o":"nodev,noexec"}}' 201 \
-    .Name=foo3 \
-    .Driver=local \
-    .Mountpoint=$volumepath/foo3/_data \
-    .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
-    .Labels.testlabel1=testonly \
-    .Options.o=nodev,noexec
+  Name=foo3 \
+  Label='{"testlabel1":"testonly"}' \
+  Options='{"type":"tmpfs","o":"nodev,noexec"}}' \
+  201 \
+  .Name=foo3 \
+  .Driver=local \
+  .Mountpoint=$volumepath/foo3/_data \
+  .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
+  .Labels.testlabel1=testonly \
+  .Options.o=nodev,noexec
 
 t GET system/df 200 '.Volumes | length=3'
 t GET libpod/system/df 200 '.Volumes | length=3'