From e42d920ebfa381322eb03cb27941ecb93eea3dd7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 15 Dec 2020 09:12:57 -0500 Subject: Add LogSize to container inspect Other log options are available so we need to add ability to look up LogSize. Signed-off-by: Daniel J Walsh --- test/e2e/logs_test.go | 5 +++++ test/system/030-run.bats | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index aae6d4f02..b370aeec1 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -332,6 +332,11 @@ var _ = Describe("Podman logs", func() { wait.WaitWithDefaultTimeout() Expect(wait).To(Exit(0)) + inspect := podmanTest.Podman([]string{"container", "inspect", "--format", "{{.HostConfig.LogConfig.Size}}", cid}) + inspect.WaitWithDefaultTimeout() + Expect(inspect).To(Exit(0)) + Expect(inspect.OutputToString()).To(Equal("10kB")) + results := podmanTest.Podman([]string{"logs", cid}) results.WaitWithDefaultTimeout() Expect(results).To(Exit(0)) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 23f924de2..f0a6ea049 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -401,7 +401,7 @@ json-file | f is "$output" "$driver" "podman inspect: driver" # If LogPath is non-null, check that it exists and has a valid log - run_podman inspect --format '{{.LogPath}}' myctr + run_podman inspect --format '{{.HostConfig.LogConfig.Path}}' myctr if [[ $do_check != '-' ]]; then is "$output" "/.*" "LogPath (driver=$driver)" if ! test -e "$output"; then -- cgit v1.2.3-54-g00ecf