summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-16 11:23:23 +0000
committerGitHub <noreply@github.com>2020-12-16 11:23:23 +0000
commitf1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1 (patch)
tree1f6ce5bd3831bf29432305a12f85d6ed6004f630 /test
parent8333a9ee90078dd8cf1194f1df59bae70709bdf1 (diff)
parente42d920ebfa381322eb03cb27941ecb93eea3dd7 (diff)
downloadpodman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.tar.gz
podman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.tar.bz2
podman-f1f7b8f6c80916bc88f5a01137e0d9fd971f8ac1.zip
Merge pull request #8730 from rhatdan/log
Add LogSize to container inspect
Diffstat (limited to 'test')
-rw-r--r--test/e2e/logs_test.go5
-rw-r--r--test/system/030-run.bats2
2 files changed, 6 insertions, 1 deletions
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 2a768dec3..29dc95dc3 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