diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-10 23:57:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 23:57:08 +0100 |
| commit | 3f57b6e0180ec82a31e4fc173aa2845394b869c6 (patch) | |
| tree | 81e75112eebb5c52c6d5ec9ee62ee476b5aa3c3a | |
| parent | 17788ed058fdcb15549bdc2b9fa831f9bfa26ca2 (diff) | |
| parent | e5ecce1da7cb55398a53fb1bf67c3c0f173a3aff (diff) | |
| download | podman-3f57b6e0180ec82a31e4fc173aa2845394b869c6.tar.gz podman-3f57b6e0180ec82a31e4fc173aa2845394b869c6.tar.bz2 podman-3f57b6e0180ec82a31e4fc173aa2845394b869c6.zip | |
Merge pull request #12795 from edsantiago/rhel8_gating_fix
[v3.4] System tests: fix RHEL8 gating tests
| -rw-r--r-- | test/system/035-logs.bats | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 76002d362..a9a2d0940 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -90,14 +90,16 @@ ${cid[0]} d" "Sequential output from logs" } function _log_test_restarted() { - run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' + local driver=$1 + local events_backend=$(_additional_events_backend $driver) + run_podman run --log-driver=$driver ${events_backend} --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' # FIXME: #9597 # run/start is flaking for remote so let's wait for the container condition # to stop wasting energy until the root cause gets fixed. run_podman container wait --condition=exited logtest - run_podman start -a logtest + run_podman ${events_backend} start -a logtest logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) - $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile + $PODMAN $_PODMAN_TEST_OPTS ${events_backend} logs -f logtest > $logfile expected=$(mktemp -p ${PODMAN_TMPDIR} expectedXXXXXXXX) seq 1 20 > $expected diff -u ${expected} ${logfile} |