summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-02 14:24:53 -0400
committerGitHub <noreply@github.com>2020-10-02 14:24:53 -0400
commit1132bcfeb5a8dca56d99c50882abc6e7775ac897 (patch)
treef1ebd1a12a7b24b42e2d6cc41bca791c4f59ffea /test
parentb58980a43ccfcef5134274c3963bf68cc51a4983 (diff)
parentc0d1954663fbf56076d1e75da396aa78016d623b (diff)
downloadpodman-1132bcfeb5a8dca56d99c50882abc6e7775ac897.tar.gz
podman-1132bcfeb5a8dca56d99c50882abc6e7775ac897.tar.bz2
podman-1132bcfeb5a8dca56d99c50882abc6e7775ac897.zip
Merge pull request #7893 from ashley-cui/journald
Fix Podman logs reading journald
Diffstat (limited to 'test')
-rw-r--r--test/e2e/logs_test.go1
-rw-r--r--test/system/035-logs.bats11
2 files changed, 12 insertions, 0 deletions
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index 3aa3cf409..67ab71d20 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -203,6 +203,7 @@ var _ = Describe("Podman logs", func() {
results.WaitWithDefaultTimeout()
Expect(results).To(Exit(0))
Expect(len(results.OutputToStringArray())).To(Equal(3))
+ Expect(results.OutputToString()).To(Equal("podman podman podman"))
})
It("using journald tail two lines", func() {
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index cbb2091e5..130bc5243 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -50,4 +50,15 @@ ${cid[1]} c
${cid[0]} d" "Sequential output from logs"
}
+@test "podman logs over journald" {
+ msg=$(random_string 20)
+
+ run_podman run --name myctr --log-driver journald $IMAGE echo $msg
+
+ run_podman logs myctr
+ is "$output" "$msg" "check that log output equals the container output"
+
+ run_podman rm myctr
+}
+
# vim: filetype=sh