diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-06 17:15:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 17:15:23 +0000 |
commit | 6663d7289e4e0910a8395f8b9422c4d4214a8cea (patch) | |
tree | 82b9a60d53f42ae9b6f1aebdc7746da7161e5a48 /test | |
parent | 6d1b2dced4e8e8651007fd245331b0ab377f1b33 (diff) | |
parent | 207065ce9f0fbe7f025905d25210add5bbf4165e (diff) | |
download | podman-6663d7289e4e0910a8395f8b9422c4d4214a8cea.tar.gz podman-6663d7289e4e0910a8395f8b9422c4d4214a8cea.tar.bz2 podman-6663d7289e4e0910a8395f8b9422c4d4214a8cea.zip |
Merge pull request #12519 from vrothberg/fix-9597
fix remote run/start flake
Diffstat (limited to 'test')
-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 44984eaad..3caf97a22 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 |