diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-01-19 07:07:37 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-01-19 09:13:22 -0700 |
| commit | abcd2923960645d740f830d53a686e6ff270cf77 (patch) | |
| tree | 5bd9f9f190cc5b1c1fcb1278b34efd2126e8682c /test/apiv2/20-containers.at | |
| parent | 1c81b67341300853d7fe9b6568b247e579c34969 (diff) | |
| download | podman-abcd2923960645d740f830d53a686e6ff270cf77.tar.gz podman-abcd2923960645d740f830d53a686e6ff270cf77.tar.bz2 podman-abcd2923960645d740f830d53a686e6ff270cf77.zip | |
APIv2 tests: followup to recent log test
Followup to #12919, which merged while I was writing
review feedback. This actually confirms log output.
This required a minor change to the 't' helper: stripping
NUL chars from the http result.
And, while I'm at it, a bunch of cleanup for running rootless:
- set $CONTAINERS_HELPER_BINARY_DIR, so we can find rootlessport
- add a few conditionals for different expectations
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/apiv2/20-containers.at')
| -rw-r--r-- | test/apiv2/20-containers.at | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index e6d49ac25..e5b9eeef3 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -18,9 +18,12 @@ podman rm -a -f &>/dev/null t GET "libpod/containers/json (at start: clean slate)" 200 length=0 -# Regression test for #12904 -podman run --rm -d --replace --name foo $IMAGE sh -c "echo 123;sleep 42" -t POST "containers/foo/attach?logs=true&stream=false" 200 +# Regression test for #12904 (race condition in logging code) +mytext="hi-there-$(random_string 15)" +podman run --rm -d --replace --name foo $IMAGE sh -c "echo $mytext;sleep 42" +# Logs output is prepended by ^A^X +t POST "containers/foo/attach?logs=true&stream=false" 200 \ + $'\001\030'$mytext t POST "containers/foo/kill" 204 podman run -v /tmp:/tmp $IMAGE true @@ -236,11 +239,16 @@ 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 is N/A when rootless +network_expect= +if root; then + network_expect='.NetworkSettings.Networks.podman.NetworkID=podman' +fi t GET containers/${cid_top}/json 200 \ .Config.Entrypoint[0]="top" \ .Config.Cmd='[]' \ .Path="top" \ - .NetworkSettings.Networks.podman.NetworkID=podman + $network_expect t POST containers/${cid_top}/start 204 # make sure the container is running t GET containers/${cid_top}/json 200 \ @@ -364,11 +372,15 @@ t GET containers/$cid/json 200 \ t DELETE containers/$cid?v=true 204 # Test Compat Create with default network mode (#10569) +networkmode=slirp4netns +if root; then + networkmode=bridge +fi t POST containers/create Image=$IMAGE HostConfig='{"NetworkMode":"default"}' 201 \ .Id~[0-9a-f]\\{64\\} cid=$(jq -r '.Id' <<<"$output") t GET containers/$cid/json 200 \ - .HostConfig.NetworkMode="bridge" + .HostConfig.NetworkMode="$networkmode" t DELETE containers/$cid?v=true 204 |