summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-08 21:17:26 +0200
committerGitHub <noreply@github.com>2021-06-08 21:17:26 +0200
commitb5e5730f0c2459546a72129f0908618b38f0a975 (patch)
tree503b7c51fd88de06c57c8a07f4a1ebf3738055a6 /test/e2e
parent9edd08c3f16d5730ac783fde3706bda49401b79f (diff)
parent84b55eec27967d1a528c4f49f100393668638e1a (diff)
downloadpodman-b5e5730f0c2459546a72129f0908618b38f0a975.tar.gz
podman-b5e5730f0c2459546a72129f0908618b38f0a975.tar.bz2
podman-b5e5730f0c2459546a72129f0908618b38f0a975.zip
Merge pull request #10600 from vrothberg/fix-10596
logs: k8s-file: fix race
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/logs_test.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index 4d9cbb48b..b576fa072 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -173,9 +173,9 @@ var _ = Describe("Podman logs", func() {
})
It("streaming output: "+log, func() {
- containerName := "logs-f-rm"
+ containerName := "logs-f"
- logc := podmanTest.Podman([]string{"run", "--log-driver", log, "--rm", "--name", containerName, "-dt", ALPINE, "sh", "-c", "echo podman; sleep 1; echo podman"})
+ logc := podmanTest.Podman([]string{"run", "--log-driver", log, "--name", containerName, "-dt", ALPINE, "sh", "-c", "echo podman-1; sleep 1; echo podman-2"})
logc.WaitWithDefaultTimeout()
Expect(logc).To(Exit(0))
@@ -183,10 +183,8 @@ var _ = Describe("Podman logs", func() {
results.WaitWithDefaultTimeout()
Expect(results).To(Exit(0))
- // TODO: we should actually check for two podman lines,
- // but as of 2020-06-17 there's a race condition in which
- // 'logs -f' may not catch all output from a container
- Expect(results.OutputToString()).To(ContainSubstring("podman"))
+ Expect(results.OutputToString()).To(ContainSubstring("podman-1"))
+ Expect(results.OutputToString()).To(ContainSubstring("podman-2"))
// Container should now be terminatING or terminatED, but we
// have no guarantee of which: 'logs -f' does not necessarily
@@ -199,6 +197,10 @@ var _ = Describe("Podman logs", func() {
} else {
Expect(inspect.ErrorToString()).To(ContainSubstring("no such container"))
}
+
+ results = podmanTest.Podman([]string{"rm", "-f", containerName})
+ results.WaitWithDefaultTimeout()
+ Expect(results).To(Exit(0))
})
It("follow output stopped container: "+log, func() {