opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 08:22:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2620 from baude/multilogs

Browse Source 
display logs for multiple containers at the same time
This commit is contained in:
OpenShift Merge Robot
2019-03-16 04:21:32 -07:00
committed by GitHub
parent 3384bd87c8 a0c35c394b
commit 97fb495718
14 changed files with 414 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/logs_test.go
View File

@ -4,6 +4,7 @@ package integration
import (
"os"
"strings"
. "github.com/containers/libpod/test/utils"
. "github.com/onsi/ginkgo"
@ -34,7 +35,6 @@ var _ = Describe("Podman logs", func() {
})
//sudo bin/podman run -it --rm fedora-minimal bash -c 'for a in `seq 5`; do echo hello; done'
It("podman logs for container", func() {
logc := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
logc.WaitWithDefaultTimeout()
@ -106,4 +106,30 @@ var _ = Describe("Podman logs", func() {
Expect(results.ExitCode()).To(Equal(0))
Expect(len(results.OutputToStringArray())).To(Equal(3))
})
It("podman logs latest and container name should fail", func() {
results := podmanTest.Podman([]string{"logs", "-l", "foobar"})
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).ToNot(Equal(0))
})
It("podman logs two containers and should display short container IDs", func() {
log1 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
log1.WaitWithDefaultTimeout()
Expect(log1.ExitCode()).To(Equal(0))
cid1 := log1.OutputToString()
log2 := podmanTest.Podman([]string{"run", "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
log2.WaitWithDefaultTimeout()
Expect(log2.ExitCode()).To(Equal(0))
cid2 := log2.OutputToString()
results := podmanTest.Podman([]string{"logs", cid1, cid2})
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
output := results.OutputToStringArray()
Expect(len(output)).To(Equal(6))
Expect(strings.Contains(output[0], cid1[:12]) || strings.Contains(output[0], cid2[:12])).To(BeTrue())
})
})