From 314cba259009bcb957831cb40954c2d4139f25ae Mon Sep 17 00:00:00 2001 From: Hironori Shiina Date: Tue, 8 Nov 2022 15:51:54 -0500 Subject: [PATCH] Skip test if `--events-backend` is necessary with podman-remote `podman-remote` does not support `--events-backend`, which overrides a log driver. When `--events-backend` is necessary in a test for `podman-remote`, the test should be skipped. We don't need to fix the other cases with `_additional_events_backend()` because `_log_test_follow()` already has the same skipping logic and `_log_test_multi()` always skips a test when testing `podman-remote`. Signed-off-by: Hironori Shiina --- test/system/035-logs.bats | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 6e84e10fc2..f9ac33d2c7 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -135,6 +135,9 @@ ${cid[0]} d" "Sequential output from logs" function _log_test_restarted() { local driver=$1 local events_backend=$(_additional_events_backend $driver) + if [[ -n "${events_backend}" ]]; then + skip_if_remote "remote does not support --events-backend" + fi 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