diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-08 16:26:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 16:26:20 +0000 |
| commit | 2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5 (patch) | |
| tree | 8aeef090d03d139578a51a0cc038da2a797cc2f3 /test/system/035-logs.bats | |
| parent | 7472aa112a608d147fd1fa3cb7e7674f8c1511c5 (diff) | |
| parent | 921e9ecbb310a0ea65a7c0eac8432fa86fdbd903 (diff) | |
| download | podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.tar.gz podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.tar.bz2 podman-2d7c4beffc38f72a49ae2e9d360d8ecc46ea76c5.zip | |
Merge pull request #12546 from edsantiago/fix_failing_tests
[3.4] Fix failing tests
Diffstat (limited to 'test/system/035-logs.bats')
| -rw-r--r-- | test/system/035-logs.bats | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index d9ec8423b..76002d362 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -91,6 +91,10 @@ ${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' + # 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 logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile |