diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-27 10:58:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-27 10:58:10 +0000 |
| commit | 3176b3fe011aa3323ba192e90efe516d0701e46e (patch) | |
| tree | dfaf6f1ea2b87ec11090e4b249bf88228b6ed1c4 /test | |
| parent | 324435a6486c050de4f06baaf2a3ff7c6b37071f (diff) | |
| parent | 3a810b8d2ad61a7bdca9b10e183ea7f6708474eb (diff) | |
| download | podman-3176b3fe011aa3323ba192e90efe516d0701e46e.tar.gz podman-3176b3fe011aa3323ba192e90efe516d0701e46e.tar.bz2 podman-3176b3fe011aa3323ba192e90efe516d0701e46e.zip | |
Merge pull request #14685 from mheon/gitlab
Followon to #14559
Diffstat (limited to 'test')
| -rw-r--r-- | test/system/030-run.bats | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 117d791d6..56cf4f266 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -376,17 +376,7 @@ json-file | f while read driver do_check; do msg=$(random_string 15) run_podman run --name myctr --log-driver $driver $IMAGE echo $msg - - # Simple output check - # Special case: 'json-file' emits a warning, the rest do not - # ...but with podman-remote the warning is on the server only - if [[ $do_check == 'f' ]] && ! is_remote; then # 'f' for 'fallback' - is "${lines[0]}" ".* level=error msg=\"json-file logging specified but not supported. Choosing k8s-file logging instead\"" \ - "Fallback warning emitted" - is "${lines[1]}" "$msg" "basic output sanity check (driver=$driver)" - else - is "$output" "$msg" "basic output sanity check (driver=$driver)" - fi + is "$output" "$msg" "basic output sanity check (driver=$driver)" # Simply confirm that podman preserved our argument as-is run_podman inspect --format '{{.HostConfig.LogConfig.Type}}' myctr |