diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-19 13:05:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 13:05:05 -0500 |
| commit | 5e2fcf813d54980df00976a01fca571b7007ae16 (patch) | |
| tree | 5bd9f9f190cc5b1c1fcb1278b34efd2126e8682c /test | |
| parent | 1c81b67341300853d7fe9b6568b247e579c34969 (diff) | |
| parent | abcd2923960645d740f830d53a686e6ff270cf77 (diff) | |
| download | podman-5e2fcf813d54980df00976a01fca571b7007ae16.tar.gz podman-5e2fcf813d54980df00976a01fca571b7007ae16.tar.bz2 podman-5e2fcf813d54980df00976a01fca571b7007ae16.zip | |
Merge pull request #12925 from edsantiago/apiv2_logs
APIv2 tests: followup to recent log test
Diffstat (limited to 'test')
| -rw-r--r-- | test/apiv2/20-containers.at | 22 | ||||
| -rwxr-xr-x | test/apiv2/test-apiv2 | 11 |
2 files changed, 26 insertions, 7 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 diff --git a/test/apiv2/test-apiv2 b/test/apiv2/test-apiv2 index 19e8c12d0..56280f04e 100755 --- a/test/apiv2/test-apiv2 +++ b/test/apiv2/test-apiv2 @@ -45,8 +45,14 @@ echo 0 >$failures_file # Where the tests live TESTS_DIR=$(realpath $(dirname $0)) +# As of 2021-11 podman has one external helper binary, rootlessport, needed +# for rootless networking. +if [[ -z "$CONTAINERS_HELPER_BINARY_DIR" ]]; then + export CONTAINERS_HELPER_BINARY_DIR=$(realpath ${TESTS_DIR}/../../bin) +fi + # Path to podman binary -PODMAN_BIN=${PODMAN:-${TESTS_DIR}/../../bin/podman} +PODMAN_BIN=${PODMAN:-${CONTAINERS_HELPER_BINARY_DIR}/podman} # Cleanup handlers clean_up_server() { @@ -289,7 +295,8 @@ function t() { output="[$(file --brief $WORKDIR/curl.result.out)]" echo "$output" >>$LOG elif [[ -e $WORKDIR/curl.result.out ]]; then - output=$(< $WORKDIR/curl.result.out) + # Output from /logs sometimes includes NULs. Strip them. + output=$(tr -d '\0' < $WORKDIR/curl.result.out) if [[ $content_type =~ application/json ]] && [[ $method != "HEAD" ]]; then jq . <<<"$output" >>$LOG |