diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 17:17:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:17:27 -0400 |
| commit | 7b00e49f657305f233e4e29613821305bf4d2962 (patch) | |
| tree | 8470c3a4a002f93514762f7fe2eb37cc0396d44b /test/e2e | |
| parent | daabbc1a1e82b840a51b6d769cdf19cfda474144 (diff) | |
| parent | 0e171b7b3327948f2e9e32d9e496736bd7a48009 (diff) | |
| download | podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.gz podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.bz2 podman-7b00e49f657305f233e4e29613821305bf4d2962.zip | |
Merge pull request #6560 from mheon/fix_exec_logdriver
Do not share container log driver for exec
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/exec_test.go | 4 | ||||
| -rw-r--r-- | test/e2e/logs_test.go | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index b152da9e6..f44d428d6 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -25,10 +25,6 @@ var _ = Describe("Podman exec", func() { podmanTest = PodmanTestCreate(tempdir) podmanTest.Setup() podmanTest.SeedImages() - // HACK: Remove this once we get Conmon 2.0.17 on Ubuntu - if podmanTest.Host.Distribution == "ubuntu" { - Skip("Unable to perform test on Ubuntu distributions due to too-old Conmon (need 2.0.17)") - } }) AfterEach(func() { diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index c12ae9c86..a4a59acb2 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -300,4 +300,15 @@ var _ = Describe("Podman logs", func() { Expect(inspect.ErrorToString()).To(ContainSubstring("no such container")) } }) + + It("podman logs with log-driver=none errors", func() { + ctrName := "logsctr" + logc := podmanTest.Podman([]string{"run", "--name", ctrName, "-d", "--log-driver", "none", ALPINE, "top"}) + logc.WaitWithDefaultTimeout() + Expect(logc).To(Exit(0)) + + logs := podmanTest.Podman([]string{"logs", "-f", ctrName}) + logs.WaitWithDefaultTimeout() + Expect(logs).To(Not(Exit(0))) + }) }) |