diff options
| author | Alex Schultz <aschultz@redhat.com> | 2021-06-11 13:56:42 -0600 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2021-07-14 09:33:21 -0600 |
| commit | 6ced24d0b66eef6d6ac5960c49b339190c83679c (patch) | |
| tree | 71b565fa3a7f491bbd8f7102758200f475c7dd6c | |
| parent | 9d98f56a64852d3bf9d3b27ad6e1ac3e3ebb6622 (diff) | |
| download | podman-6ced24d0b66eef6d6ac5960c49b339190c83679c.tar.gz podman-6ced24d0b66eef6d6ac5960c49b339190c83679c.tar.bz2 podman-6ced24d0b66eef6d6ac5960c49b339190c83679c.zip | |
Fix broken volume and container tests
There are a handful of tests that aren't actually being run because
there are missing \ which is prevented the tests from being executed.
Additionally some of the test syntax was incorrect but not showing up
because these tests didn't run.
Signed-off-by: Alex Schultz <aschultz@redhat.com>
| -rw-r--r-- | test/apiv2/20-containers.at | 8 | ||||
| -rw-r--r-- | test/apiv2/30-volumes.at | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index ef51757c9..c5b2f5ec1 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -211,15 +211,11 @@ t GET containers/$cid/json 200 \ t POST containers/create Image=$IMAGE Entrypoint='["top"]' 201 \ .Id~[0-9a-f]\\{64\\} cid_top=$(jq -r '.Id' <<<"$output") -network_expect="{}" -if root; then - network_expect='.podman.NetworkID=podman' -fi t GET containers/${cid_top}/json 200 \ .Config.Entrypoint[0]="top" \ .Config.Cmd='[]' \ - .Path="top" - .NetworkSettings.Networks="$network_expect" + .Path="top" \ + .NetworkSettings.Networks.podman.NetworkID=podman t POST containers/${cid_top}/start 204 # make sure the container is running t GET containers/${cid_top}/json 200 \ diff --git a/test/apiv2/30-volumes.at b/test/apiv2/30-volumes.at index 5feceea7b..b639e05f9 100644 --- a/test/apiv2/30-volumes.at +++ b/test/apiv2/30-volumes.at @@ -13,13 +13,14 @@ t POST libpod/volumes/create name=foo1 201 \ .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \ .Labels={} \ .Options={} +# TODO(mwhahaha): there might be a bug here since options is null and not {} t POST volumes/create 201 \ - .Name~[0-9a-f]\\{64\\} + .Name~[0-9a-f]\\{64\\} \ .Driver=local \ - .Mountpoint=$volumepath/~[0-9a-f]\\{64\\}/_data \ + .Mountpoint~$volumepath/[0-9a-f]\\{64\\}/_data \ .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \ .Labels={} \ - .Options={} + .Options=null t POST libpod/volumes/create 201 t POST libpod/volumes/create \ Name=foo2 \ |